summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authornkryptic <nkryptic@gmail.com>2013-03-12 01:08:59 -0400
committerRaphaël Barrois <raphael.barrois@polytechnique.org>2013-03-15 01:58:46 +0100
commit6c4f5846c8e21d6e48347b7e661edb72ffabb9f1 (patch)
tree966472532d500451f11a6e63ba27daa1d4d03aeb /tests
parent624aedf03974bedb34349d0664fb863935e99969 (diff)
downloadfactory-boy-6c4f5846c8e21d6e48347b7e661edb72ffabb9f1.tar
factory-boy-6c4f5846c8e21d6e48347b7e661edb72ffabb9f1.tar.gz
Add full Python 3 compatibility (Closes #10, #20, #49).
Also: - update travis.yml to build against 2.6-2.7 and 3.2-3.3 - Switch to relative imports Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/compat.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/compat.py b/tests/compat.py
index 769ffd4..6a1eb80 100644
--- a/tests/compat.py
+++ b/tests/compat.py
@@ -30,7 +30,7 @@ try:
except ImportError:
import unittest
-if is_python2:
+if sys.version_info[0:2] < (3, 3):
import mock
else:
from unittest import mock