Upgrade Python syntax with pyupgrade --py36-plus (don't apply assert changes)

Author: hugovk

setup.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #
 # Copyright 2015-2019 by Hartmut Goebel <h.goebel@crazy-compilers.com>
 #
@@ -35,7 +34,7 @@ def get_version(filename):
 
 
 def read(filename):
-    return open(filename, 'r', encoding='utf-8').read()
+    return open(filename, encoding='utf-8').read()
 
 
 long_description = '\n\n'.join([read('README.rst'),

tests/test_all_fixes.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """
 This file is part of test-suite for unittest2pytest.
 """
@@ -22,7 +21,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import unicode_literals
 
 __author__ = "Hartmut Goebel <h.goebel@crazy-compilers.com>"
 __copyright__ = "Copyright 2015-2019 by Hartmut Goebel"
@@ -108,7 +106,7 @@ def test_check_fixture(in_file, fixer, tmpdir):
     try:
         compile(''.join(expected_contents), expected_file, 'exec')
     except Exception as e:
-        pytest.fail("FATAL: %s does not compile: %s" % (expected_file, e),
+        pytest.fail(f"FATAL: {expected_file} does not compile: {e}",
                     False)
 
     if result_file_contents != expected_contents:

unittest2pytest/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2015-2019 by Hartmut Goebel <h.goebel@crazy-compilers.com>
 #

unittest2pytest/__main__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2015-2019 by Hartmut Goebel <h.goebel@crazy-compilers.com>
 #

unittest2pytest/fixes/fix_remove_class.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 fix_remove_class - lib2to3 fix for removing "class Testxxx(TestCase):"
 headers and dedenting the contained code.

unittest2pytest/fixes/fix_self_assert.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 fix_self_assert - lib2to3 fix for replacing assertXXX() method calls
 by their pytest equivalent.

unittest2pytest/utils.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Some utility functions for unittest2pytest.
 """