diff --git a/controllers.py b/controllers.py index 47f8507..47c6ea6 100644 --- a/controllers.py +++ b/controllers.py @@ -6,9 +6,15 @@ from bottle import static_file, redirect, HTTPResponse from bottle import mako_view as view from PIL import Image -from pymongo.objectid import ObjectId from models import Message +from pymongo import version +version_num = int(''.join(version.split('.'))) +if version_num > 220: + from bson.objectid import ObjectId +else: + from pymongo.objectid import ObjectId + PAGE_SIZE = 5 @get(['/', '/list', '/list/:page#\d+#'])