remove Python2 crumbs

contrib/memcache_whisper.py

@@ -41,7 +41,6 @@
   CAN_LOCK = False
 
 if sys.version_info[0] == 3:
-    xrange = range
     # This `file` hack avoids linter warnings under Python-3,
     # but this code likely only works with Python-2.
     file = None
@@ -144,7 +143,7 @@ def __readHeader(fh):
   packedMetadata = fh.read(metadataSize)
   (lastUpdate,maxRetention,xff,archiveCount) = struct.unpack(metadataFormat,packedMetadata)
   archives = []
-  for i in xrange(archiveCount):
+  for i in range(archiveCount):
     packedArchiveInfo = fh.read(archiveInfoSize)
     (offset,secondsPerPoint,points) = struct.unpack(archiveInfoFormat,packedArchiveInfo)
     archiveInfo = {
@@ -256,7 +255,7 @@ def __propagate(fh,timestamp,xff,higher,lower):
   neighborValues = [None] * points
   currentInterval = lowerIntervalStart
   step = higher['secondsPerPoint']
-  for i in xrange(0,len(unpackedSeries),2):
+  for i in range(0,len(unpackedSeries),2):
     pointTime = unpackedSeries[i]
     if pointTime == currentInterval:
       neighborValues[i/2] = unpackedSeries[i+1]
@@ -533,7 +532,7 @@ def fetch(path,fromTime,untilTime=None):
   valueList = [None] * points #pre-allocate entire list for speed
   currentInterval = fromInterval
   step = archive['secondsPerPoint']
-  for i in xrange(0,len(unpackedSeries),2):
+  for i in range(0,len(unpackedSeries),2):
     pointTime = unpackedSeries[i]
     if pointTime == currentInterval:
       pointValue = unpackedSeries[i+1]

setup.py

@@ -1,13 +1,11 @@
 #!/usr/bin/env python
 
-from __future__ import with_statement
-
 import os
-from configparser import ConfigParser, DuplicateSectionError  # Python 3
+from configparser import ConfigParser, DuplicateSectionError
 
 from glob import glob
 from collections import defaultdict
-from io import StringIO  # Python 3
+from io import StringIO
 
 # Graphite historically has an install prefix set in setup.cfg. Being in a
 # configuration file, it's not easy to override it or unset it (for installing

webapp/graphite/account/migrations/0001_initial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.2 on 2017-06-14 11:22
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion

webapp/graphite/account/views.py

@@ -13,10 +13,7 @@
 limitations under the License."""
 
 from django.contrib.auth import authenticate, login, logout
-try:
-    from django.urls import reverse
-except ImportError:  # Django < 1.10
-    from django.urls import reverse
+from django.urls import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from graphite.user_util import getProfile, isAuthenticated

webapp/graphite/carbonlink.py

@@ -1,3 +1,4 @@
+import pickle
 import time
 import socket
 import struct
@@ -11,12 +12,6 @@
 from graphite.singleton import ThreadSafeSingleton
 
 
-try:
-    import six.moves.cPickle as pickle
-except ImportError:
-    import pickle
-
-
 def load_keyfunc():
     if settings.CARBONLINK_HASHING_KEYFUNC:
         module_path, func_name = settings.CARBONLINK_HASHING_KEYFUNC.rsplit(':', 1)

webapp/graphite/dashboard/migrations/0001_initial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.2 on 2017-06-14 11:22
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

webapp/graphite/events/migrations/0001_initial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.2 on 2017-06-14 11:22
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import tagging.fields
 

webapp/graphite/finders/ceres.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import os.path
 
 # Use the built-in version of walk if possible, otherwise

webapp/graphite/functions/safe.py

@@ -1,6 +1,5 @@
 # make / work consistently between python 2.x and 3.x
 # https://www.python.org/dev/peps/pep-0238/
-from __future__ import division
 from functools import reduce
 import math
 

webapp/graphite/middleware.py

@@ -1,8 +1,5 @@
 from graphite.logger import log
-try:
-    from django.utils.deprecation import MiddlewareMixin
-except ImportError:  # Django < 1.10
-    MiddlewareMixin = object
+from django.utils.deprecation import MiddlewareMixin
 
 
 class LogExceptionsMiddleware(MiddlewareMixin):

webapp/graphite/readers/ceres.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from graphite.intervals import Interval, IntervalSet
 from graphite.readers.utils import merge_with_carbonlink, BaseReader
 

webapp/graphite/readers/utils.py

@@ -1,13 +1,9 @@
-from __future__ import division
-
 import abc
 
 from graphite.logger import log
 
 
-class BaseReader(object):
-    __metaclass__ = abc.ABCMeta
-
+class BaseReader(metaclass=abc.ABCMeta):
     supported = True
 
     @abc.abstractmethod

webapp/graphite/readers/whisper.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import time
 
 # Use the built-in version of scandir/stat if possible, otherwise

webapp/graphite/render/datalib.py

@@ -11,7 +11,6 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License."""
-from __future__ import division
 
 import collections
 import re
@@ -26,10 +25,7 @@
 from graphite.util import timebounds, logtime
 
 
-try:
-  from collections import UserDict
-except ImportError:
-  from UserDict import IterableUserDict as UserDict
+from collections import UserDict
 
 
 class Tags(UserDict):

webapp/graphite/render/functions.py

@@ -14,23 +14,15 @@
 
 # make / work consistently between python 2.x and 3.x
 # https://www.python.org/dev/peps/pep-0238/
-from __future__ import division
-
 import math
 import random
 import re
 import time
 
 from datetime import datetime, timedelta
 from functools import reduce
-from six.moves import range, zip
 import six
-try:
-  from itertools import izip, izip_longest
-except ImportError:
-  # Python 3
-  from itertools import zip_longest as izip_longest
-  izip = zip
+from itertools import zip_longest as izip_longest
 from os import environ
 
 from django.conf import settings
@@ -131,7 +123,7 @@ def normalize(seriesLists):
 
 def matchSeries(seriesList1, seriesList2):
   assert len(seriesList2) == len(seriesList1), "The number of series in each argument must be the same"
-  return izip(sorted(seriesList1, key=lambda a: a.name), sorted(seriesList2, key=lambda a: a.name))
+  return zip(sorted(seriesList1, key=lambda a: a.name), sorted(seriesList2, key=lambda a: a.name))
 
 
 def trimRecent(seriesList):

webapp/graphite/render/glyph.py

@@ -15,11 +15,10 @@
 import itertools
 import math
 import re
+from configparser import ConfigParser
 from datetime import datetime, timedelta
 
-from six.moves import range, zip
 from six.moves.urllib.parse import unquote_plus
-from six.moves.configparser import ConfigParser
 from django.conf import settings
 import pytz
 import six

webapp/graphite/render/hashing.py

@@ -16,7 +16,6 @@
 from hashlib import md5
 from itertools import chain
 import bisect
-import sys
 
 try:
     import mmh3
@@ -38,16 +37,10 @@ def fnv32a(data, seed=0x811c9dc5):
         hval = seed
         fnv_32_prime = 0x01000193
         uint32_max = 2 ** 32
-        if sys.version_info >= (3, 0):
-            # data is a bytes object, s is an integer
-            for s in data:
-                hval = hval ^ s
-                hval = (hval * fnv_32_prime) % uint32_max
-        else:
-            # data is an str object, s is a single character
-            for s in data:
-                hval = hval ^ ord(s)
-                hval = (hval * fnv_32_prime) % uint32_max
+        # data is a bytes object, s is an integer
+        for s in data:
+            hval = hval ^ s
+            hval = (hval * fnv_32_prime) % uint32_max
         return hval
 
 

webapp/graphite/render/views.py

@@ -40,7 +40,6 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.conf import settings
 from django.utils.cache import add_never_cache_headers, patch_response_headers
-from six.moves import zip
 
 
 loadFunctions()

webapp/graphite/settings.py

@@ -13,18 +13,14 @@
 limitations under the License."""
 # Django settings for graphite project.
 # DO NOT MODIFY THIS FILE DIRECTLY - use local_settings.py instead
-from __future__ import print_function
 import os
 import sys
 from os.path import abspath, dirname, join
 from warnings import warn
 from importlib import import_module
 
 from django import VERSION as DJANGO_VERSION
-try:
-    from django.urls import reverse_lazy
-except ImportError:  # Django < 1.10
-    from django.urls import reverse_lazy
+from django.urls import reverse_lazy
 
 
 GRAPHITE_WEB_APP_SETTINGS_LOADED = False

webapp/graphite/storage.py

@@ -1,7 +1,5 @@
-from __future__ import absolute_import
 import os
 import random
-import sys
 import time
 import traceback
 import types
@@ -13,12 +11,8 @@
 
 from django.conf import settings
 from django.core.cache import cache
-import six
 
-try:
-    from importlib import import_module
-except ImportError:  # python < 2.7 compatibility
-    from django.utils.importlib import import_module
+from importlib import import_module
 
 from graphite.logger import log
 from graphite.errors import InputParameterError
@@ -40,14 +34,9 @@ def get_finders(finder_path):
 
     # monkey patch so legacy finders will work
     finder = cls()
-    if sys.version_info[0] >= 3:
-        finder.fetch = types.MethodType(BaseFinder.fetch, finder)
-        finder.find_multi = types.MethodType(BaseFinder.find_multi, finder)
-        finder.get_index = types.MethodType(BaseFinder.get_index, finder)
-    else:
-        finder.fetch = types.MethodType(BaseFinder.fetch.__func__, finder)
-        finder.find_multi = types.MethodType(BaseFinder.find_multi.__func__, finder)
-        finder.get_index = types.MethodType(BaseFinder.get_index.__func__, finder)
+    finder.fetch = types.MethodType(BaseFinder.fetch, finder)
+    finder.find_multi = types.MethodType(BaseFinder.find_multi, finder)
+    finder.get_index = types.MethodType(BaseFinder.get_index, finder)
 
     return [finder]
 
@@ -307,7 +296,7 @@ def _list_nodes(self, query, nodes_by_path):
         # Reduce matching nodes for each path to a minimal set
         found_branch_nodes = set()
 
-        items = list(six.iteritems(nodes_by_path))
+        items = list(nodes_by_path.items())
         random.shuffle(items)
 
         for path, nodes in items:

webapp/graphite/tags/http.py

@@ -1,7 +1,4 @@
-from __future__ import absolute_import
-
 from binascii import b2a_base64
-import sys
 
 from graphite.http_pool import http
 from graphite.util import json
@@ -24,10 +21,7 @@ def request(self, method, url, fields, requestContext=None):
         headers = requestContext.get('forwardHeaders') if requestContext else {}
         if 'Authorization' not in headers and self.username and self.password:
             user_pw = '%s:%s' % (self.username, self.password)
-            if sys.version_info[0] >= 3:
-                user_pw_b64 = b2a_base64(user_pw.encode('utf-8')).decode('ascii')
-            else:
-                user_pw_b64 = user_pw.encode('base64')
+            user_pw_b64 = b2a_base64(user_pw.encode('utf-8')).decode('ascii')
             headers['Authorization'] = 'Basic ' + user_pw_b64
 
         req_fields = []

webapp/graphite/tags/migrations/0001_initial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.11 on 2017-08-31 17:38
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

webapp/graphite/tags/redis.py

@@ -1,8 +1,5 @@
-from __future__ import absolute_import
-
 import re
 import bisect
-import sys
 
 from graphite.tags.base import BaseTagDB, TaggedSeries
 
@@ -33,7 +30,7 @@ def __init__(self, settings, *args, **kwargs):
             port=settings.TAGDB_REDIS_PORT,
             db=settings.TAGDB_REDIS_DB,
             password=settings.TAGDB_REDIS_PASSWORD,
-            decode_responses=(sys.version_info[0] >= 3),
+            decode_responses=True,
         )
 
     def _find_series(self, tags, requestContext=None):