Merge branch 'master' of github.com:praxes/praxes

praxes · Mar 11, 2014 · fd31e6a · fd31e6a
2 parents ac5138e + 1f49fdf
commit fd31e6a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/praxes/io/spec/file.pyx b/praxes/io/spec/file.pyx
@@ -1,4 +1,10 @@
-from collections import OrderedDict
+try:
+    # >=python-2.7
+    from collections import OrderedDict
+except:
+    # backport for <python-2/7
+    from ordereddict import OrderedDict
+
 from copy import deepcopy
 import io
 import os

diff --git a/praxes/io/spec/scan.pyx b/praxes/io/spec/scan.pyx
@@ -1,7 +1,13 @@
 cdef extern from 'ctype.h':
     int isdigit(char)
 
-from collections import OrderedDict
+try:
+    # >=python-2.7
+    from collections import OrderedDict
+except:
+    # backport for <python-2/7
+    from ordereddict import OrderedDict
+
 import io
 
 import numpy as np