remove all usage of six

mozdownload/parser.py

@@ -9,8 +9,8 @@
 import re
 
 import requests
-from six.moves.html_parser import HTMLParser
-from six.moves.urllib.parse import unquote
+from html.parser import HTMLParser
+from urllib.parse import unquote
 
 
 class DirectoryParser(HTMLParser):

mozdownload/scraper.py

@@ -16,7 +16,7 @@
 import progressbar as pb
 import redo
 import requests
-from six.moves.urllib.parse import quote, urlparse
+from urllib.parse import quote, urlparse
 
 from mozdownload import errors
 from mozdownload import treeherder

mozdownload/treeherder.py

@@ -7,7 +7,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import logging
-import six
 
 from thclient import TreeherderClient
 
@@ -73,7 +72,7 @@ def query_builds_by_revision(self, revision, job_type_name='Build', debug_build=
 
             # Retrieve the option hash to filter for type of build (opt, and debug for now)
             option_hash = None
-            for key, values in six.iteritems(self.client.get_option_collection_hash()):
+            for key, values in self.client.get_option_collection_hash().items():
                 for value in values:
                     if value['name'] == ('debug' if debug_build else 'opt'):
                         option_hash = key

tests/conftest.py

@@ -2,7 +2,7 @@
 import os
 
 import pytest
-from six.moves.urllib.parse import parse_qs, urlparse
+from urllib.parse import parse_qs, urlparse
 
 from wptserve import (
     handlers,

tests/daily_scraper/test_daily_scraper.py

@@ -7,7 +7,7 @@
 import os
 
 import pytest
-from six.moves.urllib.parse import unquote
+from urllib.parse import unquote
 
 from mozdownload import DailyScraper
 from mozdownload.utils import urljoin

tests/directory_parser/test_directory_parser.py

@@ -6,8 +6,6 @@
 
 import os
 
-import six
-
 from mozdownload.parser import DirectoryParser
 from mozdownload.utils import urljoin
 
@@ -46,10 +44,7 @@ def test_filter(httpd):
     parser.entries = parser.filter(r'^\d+$')
 
     # Get only the subdirectories of the folder
-    if six.PY2:
-        dirs = os.walk(folder_path).next()[1]
-    elif six.PY3:
-        dirs = os.walk(folder_path).__next__()[1]
+    dirs = os.walk(folder_path).__next__()[1]
     dirs.sort()
     assert parser.entries == dirs
 

tests/release_candidate_scraper/test_release_candidate_scraper.py

@@ -7,7 +7,7 @@
 import os
 
 import pytest
-from six.moves.urllib.parse import unquote
+from urllib.parse import unquote
 
 from mozdownload import ReleaseCandidateScraper
 from mozdownload.utils import urljoin

tests/release_candidate_scraper/test_release_candidate_scraper_latest.py

@@ -7,7 +7,7 @@
 import os
 
 import pytest
-from six.moves.urllib.parse import unquote
+from urllib.parse import unquote
 
 from mozdownload import ReleaseCandidateScraper
 from mozdownload.utils import urljoin

tests/release_scraper/test_release_scraper.py

@@ -7,7 +7,7 @@
 import os
 
 import pytest
-from six.moves.urllib.parse import unquote
+from urllib.parse import unquote
 
 from mozdownload import ReleaseScraper
 from mozdownload.utils import urljoin

tests/release_scraper/test_release_scraper_latest.py

@@ -7,7 +7,7 @@
 import os
 
 import pytest
-from six.moves.urllib.parse import unquote
+from urllib.parse import unquote
 
 from mozdownload import ReleaseScraper
 from mozdownload.utils import urljoin

tests/remote/test_devedition.py

@@ -7,7 +7,7 @@
 """Test all scraper classes for Firefox Developer Edition against the remote server"""
 
 import pytest
-from six.moves.urllib.parse import unquote
+from urllib.parse import unquote
 
 import mozdownload
 from mozdownload.scraper import BASE_URL

tests/remote/test_firefox.py

@@ -7,7 +7,7 @@
 """Test all scraper classes for Firefox against the remote server"""
 
 import pytest
-from six.moves.urllib.parse import unquote
+from urllib.parse import unquote
 
 import mozdownload
 from mozdownload.scraper import BASE_URL

tests/remote/test_thunderbird.py

@@ -5,7 +5,7 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import pytest
-from six.moves.urllib.parse import unquote
+from urllib.parse import unquote
 
 import mozdownload
 from mozdownload.scraper import BASE_URL

tests/tinderbox_scraper/test_tinderbox_scraper.py

@@ -7,7 +7,7 @@
 import os
 
 import pytest
-from six.moves.urllib.parse import unquote
+from urllib.parse import unquote
 
 from mozdownload import TinderboxScraper
 from mozdownload.utils import urljoin

tests/treeherder/test_api.py

@@ -9,8 +9,7 @@
 import re
 
 import pytest
-import six
-from six.moves.urllib.parse import parse_qs, urlparse
+from urllib.parse import parse_qs, urlparse
 from wptserve.handlers import json_handler
 
 from mozdownload.treeherder import Treeherder, PLATFORM_MAP
@@ -32,7 +31,7 @@ def handle_rest_api(request, response):
     def do_filter(entry):
         result = True
 
-        for option, values in six.iteritems(query_options):
+        for option, values in query_options.items():
             # Don't handle options which are not properties of the entry
             if option not in entry:
                 continue

tests/try_scraper/test_try_scraper.py

@@ -7,7 +7,7 @@
 import os
 
 import pytest
-from six.moves.urllib.parse import unquote
+from urllib.parse import unquote
 
 from mozdownload import TryScraper
 from mozdownload.utils import urljoin