Issue #783: python3 compatible - fixed batched_dot

setup.py

@@ -14,17 +14,17 @@ try:
 except ImportError:
     from distutils.core import setup
 try:
-    from distutils.util import Mixin2to3
-    from lib2to3.refactor import get_fixers_from_package
-    Mixin2to3.fixer_names = [f for f in get_fixers_from_package('lib2to3.fixes')
-                             if f != 'lib2to3.fixes.fix_next']
-    from distutils.command.build_py import build_py_2to3 \
-        as build_py
-    from distutils.command.build_scripts import build_scripts_2to3 \
-        as build_scripts
+    from distutils.command.build_py import build_py_2to3 as build_py
 except ImportError:
     from distutils.command.build_py import build_py
     from distutils.command.build_scripts import build_scripts
+else:
+    exclude_fixers = ['fix_next', 'fix_filter']
+    from distutils.util import Mixin2to3
+    from lib2to3.refactor import get_fixers_from_package
+    Mixin2to3.fixer_names = [f for f in get_fixers_from_package('lib2to3.fixes')
+                             if f.rsplit('.', 1)[-1] not in exclude_fixers]
+    from distutils.command.build_scripts import build_scripts_2to3 as build_scripts
 
 
 CLASSIFIERS = """\

theano/tensor/basic.py

@@ -4113,8 +4113,9 @@ class Subtensor(Op):
                 slice_c = None
 
             return slice(slice_a, slice_b, slice_c)
-
-        elif isinstance(entry, int):
+        # There is a bug in numpy that results in isinstance(x, int) returning False for numpy integers.
+        # See <http://projects.scipy.org/numpy/ticket/2235>.
+        elif isinstance(entry, (numpy.integer, int)):
             return entry
         else:
             raise AdvancedIndexingError(Subtensor.e_indextype, entry)

theano/tensor/tests/test_basic.py

@@ -2661,7 +2661,7 @@ class T_subtensor(unittest.TestCase, utt.TestOptimizationMixin):
                 self.eval_output_and_check(t)
                 assert 0
             except Exception, e:
-                if e[0] != 'index out of bounds':
+                if exc_message(e) != 'index out of bounds':
                     raise
         finally:
             _logger.setLevel(oldlevel)