Merge remote-tracking branch 'gitorious/master'
This commit is contained in:
commit
7f8a70ef25
@ -17,4 +17,5 @@
|
|||||||
|
|
||||||
# Imports that other modules might use
|
# Imports that other modules might use
|
||||||
from pymongo import DESCENDING
|
from pymongo import DESCENDING
|
||||||
|
from pymongo.errors import InvalidId
|
||||||
from mongokit import ObjectId
|
from mongokit import ObjectId
|
||||||
|
@ -15,11 +15,10 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
from bson.errors import InvalidId
|
|
||||||
from webob import exc
|
from webob import exc
|
||||||
|
|
||||||
from mediagoblin.util import redirect
|
from mediagoblin.util import redirect
|
||||||
from mediagoblin.db.util import ObjectId
|
from mediagoblin.db.util import ObjectId, InvalidId
|
||||||
|
|
||||||
|
|
||||||
def _make_safe(decorator, original):
|
def _make_safe(decorator, original):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user