aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_modelmethods.py
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-07-14 05:49:38 +0300
committerBerker Peksag <berker.peksag@gmail.com>2014-07-14 05:49:38 +0300
commit9459fa3cede5b1a1a061cc5a15a25b2715d0d47d (patch)
treead6ec8bc18dbf4a75c58ee0492b81e4077e38213 /mediagoblin/tests/test_modelmethods.py
parent19baab1b034b31a53a0dbddd17d3f31594ce5afc (diff)
downloadmediagoblin-9459fa3cede5b1a1a061cc5a15a25b2715d0d47d.tar.lz
mediagoblin-9459fa3cede5b1a1a061cc5a15a25b2715d0d47d.tar.xz
mediagoblin-9459fa3cede5b1a1a061cc5a15a25b2715d0d47d.zip
Fix tests on Python 3.
Diffstat (limited to 'mediagoblin/tests/test_modelmethods.py')
-rw-r--r--mediagoblin/tests/test_modelmethods.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/mediagoblin/tests/test_modelmethods.py b/mediagoblin/tests/test_modelmethods.py
index ca436c76..d2d6bdcf 100644
--- a/mediagoblin/tests/test_modelmethods.py
+++ b/mediagoblin/tests/test_modelmethods.py
@@ -17,13 +17,18 @@
# Maybe not every model needs a test, but some models have special
# methods, and so it makes sense to test them here.
+from __future__ import print_function
+
from mediagoblin.db.base import Session
from mediagoblin.db.models import MediaEntry, User, Privilege
from mediagoblin.tests import MGClientTestCase
from mediagoblin.tests.tools import fixture_add_user
-import mock
+try:
+ import mock
+except ImportError:
+ import unittest.mock as mock
import pytest
@@ -205,7 +210,7 @@ def test_media_data_init(test_app):
obj_in_session = 0
for obj in Session():
obj_in_session += 1
- print repr(obj)
+ print(repr(obj))
assert obj_in_session == 0