Merge pull request #1340 from avelichka/remove-six

Remove use of six

Author: Jussi Kukkonen

pylintrc

@@ -287,7 +287,7 @@ ignore-on-opaque-inference=yes
 # List of class names for which member attributes should not be checked (useful
 # for classes with dynamically set attributes). This supports the use of
 # qualified names.
-ignored-classes=optparse.Values,thread._local,_thread._local, six.moves
+ignored-classes=optparse.Values,thread._local,_thread._local
 
 # List of module names for which member attributes should not be checked
 # (useful for modules/projects where namespaces are manipulated during runtime
@@ -334,7 +334,7 @@ init-import=no
 
 # List of qualified module names which can have objects that can redefine
 # builtins.
-redefining-builtins-modules=six.moves,future.builtins
+redefining-builtins-modules=future.builtins
 
 
 [CLASSES]

requirements-pinned.txt

@@ -7,5 +7,4 @@ pycparser==2.20           # via cffi
 pynacl==1.4.0             # via securesystemslib
 requests==2.25.1
 securesystemslib[crypto,pynacl]==0.20.0
-six==1.15.0
 urllib3==1.26.4           # via requests

requirements.txt

@@ -43,4 +43,3 @@
 #
 securesystemslib[crypto, pynacl]
 requests
-six

setup.py

@@ -113,8 +113,7 @@
   python_requires="~=3.6",
   install_requires = [
     'requests>=2.19.1',
-    'securesystemslib>=0.20.0',
-    'six>=1.11.0'
+    'securesystemslib>=0.20.0'
   ],
   packages = find_packages(exclude=['tests']),
   scripts = [

tests/simple_https_server.py

@@ -40,7 +40,7 @@
 import sys
 import ssl
 import os
-import six
+import http.server
 
 keyfile = os.path.join('ssl_certs', 'ssl_cert.key')
 certfile = os.path.join('ssl_certs', 'ssl_cert.crt')
@@ -49,8 +49,8 @@
 if len(sys.argv) > 1 and os.path.exists(sys.argv[1]):
     certfile = sys.argv[1]
 
-httpd = six.moves.BaseHTTPServer.HTTPServer(('localhost', 0),
-    six.moves.SimpleHTTPServer.SimpleHTTPRequestHandler)
+httpd = http.server.HTTPServer(('localhost', 0),
+   http.server.SimpleHTTPRequestHandler)
 
 httpd.socket = ssl.wrap_socket(
     httpd.socket, keyfile=keyfile, certfile=certfile, server_side=True)

tests/simple_server.py

@@ -35,9 +35,8 @@
 
 import sys
 import random
-
-import six
-from six.moves.SimpleHTTPServer import SimpleHTTPRequestHandler
+import socketserver
+from http.server import SimpleHTTPRequestHandler
 
 
 class QuietHTTPRequestHandler(SimpleHTTPRequestHandler):
@@ -64,9 +63,9 @@ def log_request(self, code='-', size='-'):
 
 # Allow re-use so you can re-run tests as often as you want even if the
 # tests re-use ports. Otherwise TCP TIME-WAIT prevents reuse for ~1 minute
-six.moves.socketserver.TCPServer.allow_reuse_address = True
+socketserver.TCPServer.allow_reuse_address = True
 
-httpd = six.moves.socketserver.TCPServer(('localhost', 0), handler)
+httpd = socketserver.TCPServer(('localhost', 0), handler)
 port_message = 'bind succeeded, server port is: ' \
     + str(httpd.server_address[1])
 print(port_message)

tests/slow_retrieval_server.py

@@ -32,13 +32,12 @@
 import os
 import sys
 import time
-
-import six
+import http.server
 
 
 
 # HTTP request handler.
-class Handler(six.moves.BaseHTTPServer.BaseHTTPRequestHandler):
+class Handler(http.server.BaseHTTPRequestHandler):
 
   # Overwrite do_GET.
   def do_GET(self):
@@ -66,7 +65,7 @@ def do_GET(self):
 if __name__ == '__main__':
   server_address = ('localhost', 0)
 
-  httpd = six.moves.BaseHTTPServer.HTTPServer(server_address, Handler)
+  httpd = http.server.HTTPServer(server_address, Handler)
   port_message = 'bind succeeded, server port is: ' \
       + str(httpd.server_address[1])
   print(port_message)

tests/test_arbitrary_package_attack.py

@@ -43,6 +43,7 @@
 import logging
 import unittest
 import sys
+from urllib import request
 
 import tuf
 import tuf.formats
@@ -55,7 +56,6 @@
 from tests import utils
 
 import securesystemslib
-import six
 
 logger = logging.getLogger(__name__)
 
@@ -174,7 +174,7 @@ def test_without_tuf(self):
     url_file = os.path.join(url_prefix, 'targets', 'file1.txt')
 
     # On Windows, the URL portion should not contain back slashes.
-    six.moves.urllib.request.urlretrieve(url_file.replace('\\', '/'), client_target_path)
+    request.urlretrieve(url_file.replace('\\', '/'), client_target_path)
 
     self.assertTrue(os.path.exists(client_target_path))
     length, hashes = securesystemslib.util.get_file_details(client_target_path)
@@ -188,7 +188,7 @@ def test_without_tuf(self):
     malicious_fileinfo = tuf.formats.make_targets_fileinfo(length, hashes)
 
     # On Windows, the URL portion should not contain back slashes.
-    six.moves.urllib.request.urlretrieve(url_file.replace('\\', '/'), client_target_path)
+    request.urlretrieve(url_file.replace('\\', '/'), client_target_path)
 
     length, hashes = securesystemslib.util.get_file_details(client_target_path)
     download_fileinfo = tuf.formats.make_targets_fileinfo(length, hashes)

tests/test_endless_data_attack.py

@@ -46,6 +46,7 @@
 import logging
 import unittest
 import sys
+from urllib import request
 
 import tuf
 import tuf.formats
@@ -57,7 +58,6 @@
 from tests import utils
 
 import securesystemslib
-import six
 
 logger = logging.getLogger(__name__)
 
@@ -176,7 +176,7 @@ def test_without_tuf(self):
     url_file = os.path.join(url_prefix, 'targets', 'file1.txt')
 
     # On Windows, the URL portion should not contain backslashes.
-    six.moves.urllib.request.urlretrieve(url_file.replace('\\', '/'), client_target_path)
+    request.urlretrieve(url_file.replace('\\', '/'), client_target_path)
 
     self.assertTrue(os.path.exists(client_target_path))
     length, hashes = securesystemslib.util.get_file_details(client_target_path)
@@ -194,7 +194,7 @@ def test_without_tuf(self):
     self.assertTrue(large_length > length)
 
     # On Windows, the URL portion should not contain backslashes.
-    six.moves.urllib.request.urlretrieve(url_file.replace('\\', '/'), client_target_path)
+    request.urlretrieve(url_file.replace('\\', '/'), client_target_path)
 
     length, hashes = securesystemslib.util.get_file_details(client_target_path)
     download_fileinfo = tuf.formats.make_targets_fileinfo(length, hashes)
@@ -269,7 +269,7 @@ def test_with_tuf(self):
       self.repository_updater.refresh()
 
     except tuf.exceptions.NoWorkingMirrorError as exception:
-      for mirror_url, mirror_error in six.iteritems(exception.mirror_errors):
+      for mirror_url, mirror_error in exception.mirror_errors.items():
         self.assertTrue(isinstance(mirror_error, securesystemslib.exceptions.Error))
 
     else:

tests/test_extraneous_dependencies_attack.py

@@ -60,7 +60,6 @@
 from tests import utils
 
 import securesystemslib
-import six
 
 logger = logging.getLogger(__name__)
 
@@ -206,7 +205,7 @@ def test_with_tuf(self):
     # Verify that the specific 'tuf.exceptions.ForbiddenTargetError' exception is raised
     # by each mirror.
     except tuf.exceptions.NoWorkingMirrorError as exception:
-      for mirror_url, mirror_error in six.iteritems(exception.mirror_errors):
+      for mirror_url, mirror_error in exception.mirror_errors.items():
         url_prefix = self.repository_mirrors['mirror1']['url_prefix']
         url_file = os.path.join(url_prefix, 'metadata', 'role1.json')