py2.5 compatibilities w/six.py

-except Exception as e:
+except Exception, err:

the unfortunate use of six.b('') instead of b''
print(arg0, arg1) => six.print_(arg0, arg1)

some autopep8 -i is definitely called for, some of these test cases are darn unreadable, but did partially pep8 some of the really-long-over-80col-lines.

1 files changed, 2 insertions, 3 deletions

diff --git a/tests/PexpectTestCase.py b/tests/PexpectTestCase.py
index cfdcd58..1e5123d 100644
--- a/tests/PexpectTestCase.py
+++ b/tests/PexpectTestCase.py
@@ -18,11 +18,10 @@ PEXPECT LICENSE
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 '''
-from __future__ import print_function
-
 import unittest
 import sys
 import os
+from pexpect import six
 
 class PexpectTestCase(unittest.TestCase):
     def setUp(self):
@@ -30,7 +29,7 @@ class PexpectTestCase(unittest.TestCase):
         self.original_path = os.getcwd()
         newpath = os.path.join (os.environ['PROJECT_PEXPECT_HOME'], 'tests')
         os.chdir (newpath)
-        print('\n', self.id(), end='')
+        six.print_('\n', self.id(), end='')
         unittest.TestCase.setUp(self)
     def tearDown(self):
         os.chdir (self.original_path)