summaryrefslogtreecommitdiff
path: root/crystal.py
diff options
context:
space:
mode:
authorC Nelson <cnelsonsic@gmail.com>2012-04-06 11:54:48 -0500
committerC Nelson <cnelsonsic@gmail.com>2012-04-06 11:54:48 -0500
commit721751dd57ba8d257cdafd00d747ede6742bc5a9 (patch)
tree019f2694d6acd8607db843a466a8e4b2ae3b0c4b /crystal.py
parent76aab69763b896dfed69eb32df092ccb6d66da63 (diff)
Adding an exception handler around the unittest import.
original-commit-id: 4de0c12b438cf99e90070e723508ce636278e063
Diffstat (limited to 'crystal.py')
-rw-r--r--crystal.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/crystal.py b/crystal.py
index ef03ec1..d303c9d 100644
--- a/crystal.py
+++ b/crystal.py
@@ -11,7 +11,10 @@ from bisect import bisect_left, bisect_right
from itertools import izip
#for testing all this crap
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
if not hasattr(json, "dumps"):
json.dumps = json.write