Cosmetic changes to imports: using gof.python25, where the check for python version is made

theano/compile/function_module.py

@@ -8,8 +8,7 @@ import cPickle
 
 import sys, time, copy
 
-if sys.version_info[:2] >= (2,5):
-  from functools import partial
+from theano.gof.python25 import partial
 
 import numpy
 import theano.gof

theano/compile/module.py

@@ -10,11 +10,7 @@ from theano import gof
 from theano.printing import pprint
 import io, sys
 
-if sys.version_info[:2] >= (2,5):
-  from functools import partial
-  from collections import defaultdict
-else:
-  from theano.gof.python25 import any, all, defaultdict, partial
+from theano.gof.python25 import any, all, defaultdict, partial
 
 from itertools import chain
 

theano/gof/python25.py

@@ -65,7 +65,7 @@ else:
      import __builtin__
      all = __builtin__.all
      any = __builtin__.any
-     import functools
+     import functools, collections
      partial = functools.partial
-
+     defaultdict = collections.defaultdict
 __all__ = ['all', 'any']

theano/gof/toolbox.py

 import sys
 
-if sys.version_info[:2] >= (2,5):
-  from functools import partial
-else:
-  from theano.gof.python25 import partial
+from theano.gof.python25 import partial
 
 import graph
 

theano/tensor/basic.py

@@ -6,8 +6,6 @@ import __builtin__
 import sys # for sys.maxint
 from theano.configparser import config, AddConfigVar, BoolParam
 import traceback #for overriding Op.__call__
-if sys.version_info >= (2,5):
-  import functools
 
 import numpy, theano
 #from copy import copy as python_copy