diff options
| author | Chris Moylan <chris@chrismoylan.com> | 2011-06-22 21:40:17 -0500 |
|---|---|---|
| committer | Chris Moylan <chris@chrismoylan.com> | 2011-06-22 21:40:17 -0500 |
| commit | dcebe4b032453b31db93e0796c84de7dc8bdb005 (patch) | |
| tree | 7608cd77fafd6ffb6179e8d7bd1c50bfcd9cdfb5 /mediagoblin/decorators.py | |
| parent | 1975b5dd1fdae5ddb2819b8c67a29f9c374fce40 (diff) | |
| parent | 54de443a6a6cd673cfef0efa73a9d5e6fc6cde7c (diff) | |
| download | mediagoblin-dcebe4b032453b31db93e0796c84de7dc8bdb005.tar.lz mediagoblin-dcebe4b032453b31db93e0796c84de7dc8bdb005.tar.xz mediagoblin-dcebe4b032453b31db93e0796c84de7dc8bdb005.zip | |
Merge branch 'master' into test_submission_views_365
Diffstat (limited to 'mediagoblin/decorators.py')
| -rw-r--r-- | mediagoblin/decorators.py | 3 |
1 files changed, 1 insertions, 2 deletions
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): |