remove python2 methods (basestring, xrange)

Author: Helene

source/queryHandler/Query.py

@@ -20,14 +20,10 @@
 @author: NSCHULD
 '''
 #
-import sys
 
 
 def isString(val):
-    if sys.version < '3':
-        return isinstance(val, basestring)
-    else:
-        return isinstance(val, str)
+    return isinstance(val, str)
 
 
 class Query(object):

source/queryHandler/QueryHandler.py

@@ -35,8 +35,6 @@
     import SysmonLogger
 except Exception:
     pass
-if sys.version < '3':
-    range = xrange
 
 
 EMPTY = json.loads('{"header" : {"bcount" : 0, "bsize" : 0, "t_start" : 0, "t_end" : 0 }, "legend" : [], "rows" : [], "rangeData": [] }')
@@ -148,6 +146,7 @@ def start_str(self):
     def end_str(self):
         return time.strftime("%Y-%m-%d_%H:%M:%S", time.localtime(self.end))
 
+
 DEFAULT_DOMAIN = Domain(99, 0, 6666666666, 666)
 
 
@@ -331,7 +330,7 @@ def dAVG(self, valList):
         l = len(valList)
         if l == 0:
             return None
-        return int(round(s/l))
+        return int(round(s / l))
 
     def __colstat(self, column, fn, reverse=False):
         if isinstance(column, ColumnInfo):

source/zimonGrafanaIntf.py

@@ -279,8 +279,7 @@ def _getTimeMultiplier(self, timeunit):
             'd': 86400,
             'w': 604800,
             'n': 2628000,
-            'y': 31536000,
-            }.get(timeunit, -1)
+            'y': 31536000, }.get(timeunit, -1)
 
     def _retrieveData(self, query, dsOp=None, dsInterval=None):
         '''Executes zimon query and returns results'''
@@ -409,7 +408,7 @@ def _calc_bucketSize(self, downsample):
         bstr = downsample
 
         if '-' in bstr:
-            x = re.split('(\d+)', bstr[:bstr.find('-')])
+            x = re.split(r'(\d+)', bstr[:bstr.find('-')])
             if len(x) == 3:  # if not 3, then split failed
                 if x[1]:  # there is a time value
                     if x[1].isdigit():