Fix last few problem with the giant python2/3 PR.

theano/gof/tests/test_fg.py

@@ -6,7 +6,7 @@ import unittest
 from nose.plugins.skip import SkipTest
 
 import theano
-from theano.compat.six import PY3
+from theano.compat import PY3
 from theano.gof import CachedConstantError, FunctionGraph
 from theano import tensor as tt
 

theano/sandbox/cuda/tests/test_type.py

@@ -57,15 +57,11 @@ def test_unpickle_cudandarray_as_numpy_ndarray_flag1():
         fname = 'CudaNdarray.pkl'
 
         with open(os.path.join(testfile_dir, fname), 'rb') as fp:
-<<<<<<< HEAD
             if PY3:
                 u = CompatUnpickler(fp, encoding="latin1")
             else:
                 u = CompatUnpickler(fp)
             mat = u.load()
-=======
-            mat = pickle.load(fp)
->>>>>>> Import rewrites and renames to 3.x names.
 
         assert isinstance(mat, numpy.ndarray)
         assert mat[0] == -42.0

theano/tests/test_flake8.py

@@ -19,7 +19,6 @@ __copyright__ = "(c) 2015, Universite de Montreal"
 __contact__ = "Saizheng Zhang <saizhenglisa..at..gmail.com>"
 
 whitelist_flake8 = [
-    "compat/six.py",  # external package bundled for convenience.
     "__init__.py",
     "tests/test_gradient.py",
     "tests/test_config.py",