diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-22 09:52:13 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-22 09:52:13 -0500 |
| commit | cf383901a960897b92d05bd04b88d688920c6ef7 (patch) | |
| tree | 8b3263b77c96d3b259359b83e3426ab802dea5b5 | |
| parent | d220f87c120e4c8627a80adaa6fab18ebe85669f (diff) | |
| parent | 3efdd97c2e3e3af3b9c74e6ab217fd57088e9dfa (diff) | |
| download | mediagoblin-cf383901a960897b92d05bd04b88d688920c6ef7.tar.lz mediagoblin-cf383901a960897b92d05bd04b88d688920c6ef7.tar.xz mediagoblin-cf383901a960897b92d05bd04b88d688920c6ef7.zip | |
Merge remote branch 'remotes/elrond/idea/invalidid'
| -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): |