Improve robustness of test_futurize.py and test_pasteurize.py

Previously two tests within these scripts tried to access the filename using
__file__, assuming this to be the name of the .py script. This assumption was
incorrect sometimes on Py2 when the __file__ string pointed to a ``.pyc`` file.

Removed two xfail decorators

Author: edschofield

docs/whatsnew.rst

@@ -8,7 +8,7 @@ What's New
 What's new in version 0.14.4 (2015-06-03)
 =========================================
 
-This release adds two new minor features and fixes some small bugs.
+This is primarily a bug-fix release. It adds two new minor features and fixes several small bugs.
 
 Minor features:
 
@@ -21,6 +21,7 @@ Bug fixes:
   implementations where appropriate (issue #146 - thanks to Matt Bogosian)
 - Fixed newrange slicing for some slice/range combos (issue #132, thanks to Brad Walker)
 - Small doc fixes
+- Improve robustness of test suite with .pyc files on Py2
 
 
 What's new in version 0.14.3 (2014-12-15)

tests/test_future/test_futurize.py

@@ -17,7 +17,15 @@
 
 
 class TestLibFuturize(unittest.TestCase):
-    @skip26    # mysterious sporadic UnicodeDecodeError raised by lib2to3 ...
+
+    def setUp(self):
+        # For tests that need a text file:
+        _, self.textfilename = tempfile.mkstemp(text=True)
+        super(TestLibFuturize, self).setUp()
+
+    def tearDown(self):
+        os.unlink(self.textfilename)
+
     def test_correct_exit_status(self):
         """
         Issue #119: futurize and pasteurize were not exiting with the correct
@@ -26,8 +34,7 @@ def test_correct_exit_status(self):
         translates into 1!
         """
         from libfuturize.main import main
-        # Try futurizing this test script:
-        retcode = main([__file__])
+        retcode = main([self.textfilename])
         self.assertTrue(isinstance(retcode, int))   # i.e. Py2 builtin int
 
     def test_is_shebang_comment(self):
@@ -82,9 +89,6 @@ class TestFuturizeSimple(CodeHandler):
     tests for whether they can be passed to ``futurize`` and immediately
     run under both Python 2 again and Python 3.
     """
-    def setUp(self):
-        self.tempdir = tempfile.mkdtemp() + os.path.sep
-        super(TestFuturizeSimple, self).setUp()
 
     def test_encoding_comments_kept_at_top(self):
         """
@@ -449,7 +453,6 @@ def test_source_coding_utf8(self):
         # -*- coding: utf-8 -*-
         icons = [u"◐", u"◓", u"◑", u"◒"]
         """
-        self.unchanged(code)
 
     def test_exception_syntax(self):
         """
@@ -488,7 +491,7 @@ def test_file(self):
         file() as a synonym for open() is obsolete and invalid on Python 3.
         """
         before = '''
-        f = file(__file__)
+        f = file(self.textfilename)
         data = f.read()
         f.close()
         '''
@@ -851,7 +854,7 @@ def test_absolute_import_changes(self):
 
         Issue #16 (with porting bokeh/bbmodel.py)
         """
-        with open(tempdir + 'specialmodels.py', 'w') as f:
+        with open(self.tempdir + 'specialmodels.py', 'w') as f:
             f.write('pass')
 
         before = """

tests/test_future/test_pasteurize.py

@@ -21,6 +21,14 @@ class TestPasteurize(CodeHandler):
     on both Py3 and Py2.
     """
 
+    def setUp(self):
+        # For tests that need a text file:
+        _, self.textfilename = tempfile.mkstemp(text=True)
+        super(TestPasteurize, self).setUp()
+
+    def tearDown(self):
+        os.unlink(self.textfilename)
+
     @skip26    # Python 2.6's lib2to3 causes the "from builtins import
                # range" line to be stuck at the bottom of the module!
     def test_range_slice(self):
@@ -130,7 +138,6 @@ def test_urllib_refactor2(self):
         filename = urllib_parse.urlparse(url)[2].split('/')[-1]
         """
 
-    @skip26    # mysterious sporadic UnicodeDecodeError raised by lib2to3 ...
     def test_correct_exit_status(self):
         """
         Issue #119: futurize and pasteurize were not exiting with the correct
@@ -140,7 +147,7 @@ def test_correct_exit_status(self):
         """
         from libpasteurize.main import main
         # Try pasteurizing this test script:
-        retcode = main([__file__])
+        retcode = main([self.textfilename])
         self.assertTrue(isinstance(retcode, int))   # i.e. Py2 builtin int