Removing future imports from setup.py, conditional pickle load in tes…

…t_cartpole

setup.py

@@ -5,13 +5,6 @@
 (https://github.com/pydata/pandas) which have been permitted for use under the
 BSD license.
 """
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-from builtins import open
-from future import standard_library
-standard_library.install_aliases()
 import sys
 import glob
 import multiprocessing
@@ -266,7 +259,8 @@ def no_cythonize(extensions, **_ignore):
           'joblib',
           'hyperopt',
           'pymongo',
-          'cairocffi'
+          'cairocffi',
+          'future'
       ],
       setup_requires=['numpy >= 1.7'],
       ext_modules=extensions,

tests/test_cartpole.py

@@ -12,6 +12,7 @@
 from nose.tools import eq_
 from rlpy.Tools import __rlpy_location__
 import os
+import sys
 
 
 def test_cartpole():
@@ -37,7 +38,10 @@ def test_cartpole():
 
 def check_traj(domain_class, filename):
     with open(filename, 'rb') as f:
-        traj = pickle.load(f, encoding='latin1')
+        if not sys.version_info[:2] == (2, 7):
+            traj = pickle.load(f, encoding='latin1')
+        else:
+            traj = pickle.load(f)
     traj_now = sample_random_trajectory(domain_class)
     for i, e1, e2 in zip(list(range(len(traj_now))), traj_now, traj):
         print(i)