Moved compatibility code from theano.gof.python25 to theano.compat.

theano/compat/__init__.py

@@ -24,6 +24,13 @@ if PY3:
         """Return -1 if x<y, 0 if x==y, 1 if x > y."""
         return (a > b) - (a < b)
 
+    all = all
+    any = any
+    from functools import partial
+    from collections import defaultdict, deque
+    from itertools import combinations, product
+    from sys import maxsize
+
 
 else:
 
@@ -34,3 +41,8 @@ else:
         return e[0]
 
     cmp = cmp
+
+    # Older Python 2.x compatibility
+    from theano.compat.python2x import all, any, partial, defaultdict, deque
+    from theano.compat.python2x import combinations, product, maxsize
+    from theano.compat.python2x import DictMixin, OrderedDict, Callable

theano/gof/python25.py → theano/compat/python2x.py

 """
-Helper functions to make gof backwards compatible
+Helper functions to make theano backwards compatible with python 2.4 - 2.7
 
 (tested on python 2.4 and 2.5)
 """
@@ -105,7 +105,7 @@ else:
     defaultdict = collections.defaultdict
     deque = collections.deque
 
-__all__ = ['all', 'any']
+__all__ = ['all', 'any', 'partial', 'defaultdict', 'deque']
 
 if sys.version_info[:2] < (2, 6):
     # Borrowed from Python docs
@@ -159,6 +159,8 @@ else:
     from itertools import combinations, product
     from sys import maxsize
 
+__all__ += ['combinations', 'product', 'maxsize']
+
 
 if sys.version_info[:2] < (2, 7):
     # The following implementation of OrderedDict compatible with python 2.4
@@ -301,6 +303,7 @@ else:
     OrderedDict = collections.OrderedDict
     from collections import Callable
 
+__all__ += ['DictMixin', 'OrderedDict', 'Callable']
 
 class DefaultOrderedDict(OrderedDict):
     def __init__(self, default_factory=None, *a, **kw):
@@ -334,3 +337,5 @@ class DefaultOrderedDict(OrderedDict):
 
     def __copy__(self):
         return type(self)(self.default_factory, self)
+
+__all__ += ['DefaultOrderedDict']