merge master

piqueserver/server.py

@@ -20,7 +20,6 @@
 pyspades - default/featured server
 """
 from __future__ import print_function, unicode_literals
-from six import text_type
 import sys
 import os
 import imp
@@ -32,6 +31,8 @@
 from collections import deque
 
 import six
+from six import text_type
+from six.moves import range
 
 from ipaddress import ip_network, ip_address
 from twisted.internet import reactor
@@ -61,11 +62,6 @@
 # won't be used; just need to be executed
 import piqueserver.core_commands
 
-try:
-    range = xrange  # pylint: disable=redefined-builtin
-except NameError:
-    pass
-
 def check_passwords(passwords):
     '''
     Validator function to be run when the passwords configuration item is updated/set.