More cleanup following py2 removal

* Drop py2-only hacking pin from test-requirements.

* Remove quote() helper; urllib.parse.quote() works fine.

* Remove some useless code.

Change-Id: I9ffc923f58f1d11538f83ff26f7beb53cdf134c3

3 files changed, 1 insertions, 16 deletions

diff --git a/swiftclient/client.py b/swiftclient/client.py
index a9130ab..168bfed 100644
--- a/swiftclient/client.py
+++ b/swiftclient/client.py
@@ -23,7 +23,7 @@ import warnings
 
 from requests.exceptions import RequestException, SSLError
 import http.client as http_client
-from urllib.parse import quote as _quote, unquote
+from urllib.parse import quote, unquote
 from urllib.parse import urljoin, urlparse, urlunparse
 from time import sleep, time
 
@@ -181,14 +181,6 @@ def parse_header_string(data):
     return unquoted
 
 
-def quote(value, safe='/'):
-    """
-    Patched version of urllib.quote that encodes utf8 strings before quoting.
-    On Python 3, call directly urllib.parse.quote().
-    """
-    return _quote(value, safe=safe)
-
-
 def encode_utf8(value):
     if type(value) in (int, float, bool):
         # As of requests 2.11.0, headers must be byte- or unicode-strings.
diff --git a/swiftclient/service.py b/swiftclient/service.py
index 9d9fc59..ed0f40a 100644
--- a/swiftclient/service.py
+++ b/swiftclient/service.py
@@ -2034,11 +2034,6 @@ class SwiftService:
         if headers is None:
             headers = {}
         segment_results.sort(key=lambda di: di['segment_index'])
-        for seg in segment_results:
-            seg_loc = seg['segment_location'].lstrip('/')
-            if isinstance(seg_loc, str):
-                seg_loc = seg_loc.encode('utf-8')
-
         manifest_data = json.dumps([
             {
                 'path': d['segment_location'],
diff --git a/swiftclient/shell.py b/swiftclient/shell.py
index df7c511..445d4cb 100755
--- a/swiftclient/shell.py
+++ b/swiftclient/shell.py
@@ -1929,8 +1929,6 @@ def add_default_args(parser):
 def main(arguments=None):
     argv = sys_argv if arguments is None else arguments
 
-    argv = [a if isinstance(a, str) else a.decode('utf-8') for a in argv]
-
     parser = argparse.ArgumentParser(
         add_help=False, formatter_class=HelpFormatter, usage='''
 %(prog)s [--version] [--help] [--os-help] [--snet] [--verbose]