heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gitorious/master'

Browse Source
This commit is contained in:
Jef van Schendel 2011-06-22 17:01:20 +02:00
commit 7f8a70ef25
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mediagoblin/db/util.py
View File

@ -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

3
mediagoblin/decorators.py
View File

@ -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):