diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-22 17:01:20 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-22 17:01:20 +0200 |
| commit | 7f8a70ef25a36561042b34afba899ecf37aacfdc (patch) | |
| tree | fa8e757b705b763e2c848077704ad88863d4e959 | |
| parent | 69a303a84ce3bc18e4e5a745a07a720fb7b0c73e (diff) | |
| parent | cf383901a960897b92d05bd04b88d688920c6ef7 (diff) | |
| download | mediagoblin-7f8a70ef25a36561042b34afba899ecf37aacfdc.tar.lz mediagoblin-7f8a70ef25a36561042b34afba899ecf37aacfdc.tar.xz mediagoblin-7f8a70ef25a36561042b34afba899ecf37aacfdc.zip | |
Merge remote-tracking branch 'gitorious/master'
| -rw-r--r-- | mediagoblin/db/util.py | 1 | ||||
| -rw-r--r-- | mediagoblin/decorators.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py index 30615fca..470da531 100644 --- a/mediagoblin/db/util.py +++ b/mediagoblin/db/util.py @@ -17,4 +17,5 @@ # Imports that other modules might use from pymongo import DESCENDING +from pymongo.errors import InvalidId from mongokit import ObjectId diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index c2fe3f9f..081eda62 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -15,11 +15,10 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -from bson.errors import InvalidId from webob import exc from mediagoblin.util import redirect -from mediagoblin.db.util import ObjectId +from mediagoblin.db.util import ObjectId, InvalidId def _make_safe(decorator, original): |