Some more PEPing (I hope that I haven't broke anything)

2025-12-15 04:09:02 +00:00 · 2018-03-13 13:45:42 +01:00
parent 8166a4eeb8
commit fa4c1c5251
66 changed files with 1157 additions and 1288 deletions
--- a/lib/utils/api.py
+++ b/lib/utils/api.py
@@ -94,7 +94,7 @@ class Database(object):
                else:
                    self.cursor.execute(statement)
            except sqlite3.OperationalError, ex:
-                if not "locked" in getSafeExString(ex):
+                if "locked" not in getSafeExString(ex):
                    raise
            else:
                break
@@ -103,22 +103,11 @@ class Database(object):
            return self.cursor.fetchall()

    def init(self):
-        self.execute("CREATE TABLE logs("
-                  "id INTEGER PRIMARY KEY AUTOINCREMENT, "
-                  "taskid INTEGER, time TEXT, "
-                  "level TEXT, message TEXT"
-                  ")")
+        self.execute("CREATE TABLE logs(id INTEGER PRIMARY KEY AUTOINCREMENT, taskid INTEGER, time TEXT, level TEXT, message TEXT)")

-        self.execute("CREATE TABLE data("
-                  "id INTEGER PRIMARY KEY AUTOINCREMENT, "
-                  "taskid INTEGER, status INTEGER, "
-                  "content_type INTEGER, value TEXT"
-                  ")")
+        self.execute("CREATE TABLE data(id INTEGER PRIMARY KEY AUTOINCREMENT, taskid INTEGER, status INTEGER, content_type INTEGER, value TEXT)")

-        self.execute("CREATE TABLE errors("
-                    "id INTEGER PRIMARY KEY AUTOINCREMENT, "
-                    "taskid INTEGER, error TEXT"
-                    ")")
+        self.execute("CREATE TABLE errors(id INTEGER PRIMARY KEY AUTOINCREMENT, taskid INTEGER, error TEXT)")

 class Task(object):
    def __init__(self, taskid, remote_addr):
@@ -860,7 +849,7 @@ def client(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT, username=Non
            return

        elif command in ("help", "?"):
-            msg =  "help           Show this help message\n"
+            msg = "help           Show this help message\n"
            msg += "new ARGS       Start a new scan task with provided arguments (e.g. 'new -u \"http://testphp.vulnweb.com/artists.php?artist=1\"')\n"
            msg += "use TASKID     Switch current context to different task (e.g. 'use c04d8c5c7582efb4')\n"
            msg += "data           Retrieve and show data for current task\n"
--- a/lib/utils/crawler.py
+++ b/lib/utils/crawler.py
@@ -167,7 +167,7 @@ def crawl(target):
            if not conf.bulkFile:
                logger.info("searching for links with depth %d" % (i + 1))

-            runThreads(numThreads, crawlThread, threadChoice=(i>0))
+            runThreads(numThreads, crawlThread, threadChoice=(i > 0))
            clearConsoleLine(True)

            if threadData.shared.deeper:
--- a/lib/utils/deps.py
+++ b/lib/utils/deps.py
@@ -108,4 +108,3 @@ def checkDependencies():
    if len(missing_libraries) == 0:
        infoMsg = "all dependencies are installed"
        logger.info(infoMsg)
-
--- a/lib/utils/getch.py
+++ b/lib/utils/getch.py
@@ -25,7 +25,7 @@ class _Getch(object):

 class _GetchUnix(object):
    def __init__(self):
-        import tty
+        __import__("tty")

    def __call__(self):
        import sys
@@ -44,7 +44,7 @@ class _GetchUnix(object):

 class _GetchWindows(object):
    def __init__(self):
-        import msvcrt
+        __import__("msvcrt")

    def __call__(self):
        import msvcrt
@@ -81,4 +81,3 @@ class _GetchMacCarbon(object):


 getch = _Getch()
-
--- a/lib/utils/hash.py
+++ b/lib/utils/hash.py
@@ -135,7 +135,6 @@ def postgres_passwd(password, username, uppercase=False):
    'md599e5ea7a6f7c3269995cba3927fd0093'
    """

-
    if isinstance(username, unicode):
        username = unicode.encode(username, UNICODE_ENCODING)

@@ -380,7 +379,7 @@ def unix_md5_passwd(password, salt, magic="$1$", **kwargs):
    ctx = password + magic + salt
    final = md5(password + salt + password).digest()

-    for pl in xrange(len(password),0,-16):
+    for pl in xrange(len(password), 0, -16):
        if pl > 16:
            ctx = ctx + final[:16]
        else:
@@ -389,7 +388,7 @@ def unix_md5_passwd(password, salt, magic="$1$", **kwargs):
    i = len(password)
    while i:
        if i & 1:
-            ctx = ctx + chr(0)  #if ($i & 1) { $ctx->add(pack("C", 0)); }
+            ctx = ctx + chr(0)  # if ($i & 1) { $ctx->add(pack("C", 0)); }
        else:
            ctx = ctx + password[0]
        i = i >> 1
@@ -417,7 +416,7 @@ def unix_md5_passwd(password, salt, magic="$1$", **kwargs):

        final = md5(ctx1).digest()

-    hash_ = _encode64((int(ord(final[0])) << 16) | (int(ord(final[6])) << 8) | (int(ord(final[12]))),4)
+    hash_ = _encode64((int(ord(final[0])) << 16) | (int(ord(final[6])) << 8) | (int(ord(final[12]))), 4)
    hash_ = hash_ + _encode64((int(ord(final[1])) << 16) | (int(ord(final[7])) << 8) | (int(ord(final[13]))), 4)
    hash_ = hash_ + _encode64((int(ord(final[2])) << 16) | (int(ord(final[8])) << 8) | (int(ord(final[14]))), 4)
    hash_ = hash_ + _encode64((int(ord(final[3])) << 16) | (int(ord(final[9])) << 8) | (int(ord(final[15]))), 4)
@@ -522,38 +521,38 @@ def wordpress_passwd(password, salt, count, prefix, **kwargs):
    return "%s%s" % (prefix, _encode64(hash_, 16))

 __functions__ = {
-                    HASH.MYSQL: mysql_passwd,
-                    HASH.MYSQL_OLD: mysql_old_passwd,
-                    HASH.POSTGRES: postgres_passwd,
-                    HASH.MSSQL: mssql_passwd,
-                    HASH.MSSQL_OLD: mssql_old_passwd,
-                    HASH.MSSQL_NEW: mssql_new_passwd,
-                    HASH.ORACLE: oracle_passwd,
-                    HASH.ORACLE_OLD: oracle_old_passwd,
-                    HASH.MD5_GENERIC: md5_generic_passwd,
-                    HASH.SHA1_GENERIC: sha1_generic_passwd,
-                    HASH.SHA224_GENERIC: sha224_generic_passwd,
-                    HASH.SHA256_GENERIC: sha256_generic_passwd,
-                    HASH.SHA384_GENERIC: sha384_generic_passwd,
-                    HASH.SHA512_GENERIC: sha512_generic_passwd,
-                    HASH.CRYPT_GENERIC: crypt_generic_passwd,
-                    HASH.JOOMLA: joomla_passwd,
-                    HASH.DJANGO_MD5: django_md5_passwd,
-                    HASH.DJANGO_SHA1: django_sha1_passwd,
-                    HASH.WORDPRESS: wordpress_passwd,
-                    HASH.APACHE_MD5_CRYPT: unix_md5_passwd,
-                    HASH.UNIX_MD5_CRYPT: unix_md5_passwd,
-                    HASH.APACHE_SHA1: apache_sha1_passwd,
-                    HASH.VBULLETIN: vbulletin_passwd,
-                    HASH.VBULLETIN_OLD: vbulletin_passwd,
-                    HASH.SSHA: ssha_passwd,
-                    HASH.SSHA256: ssha256_passwd,
-                    HASH.SSHA512: ssha512_passwd,
-                    HASH.MD5_BASE64: md5_generic_passwd,
-                    HASH.SHA1_BASE64: sha1_generic_passwd,
-                    HASH.SHA256_BASE64: sha256_generic_passwd,
-                    HASH.SHA512_BASE64: sha512_generic_passwd,
-                }
+    HASH.MYSQL: mysql_passwd,
+    HASH.MYSQL_OLD: mysql_old_passwd,
+    HASH.POSTGRES: postgres_passwd,
+    HASH.MSSQL: mssql_passwd,
+    HASH.MSSQL_OLD: mssql_old_passwd,
+    HASH.MSSQL_NEW: mssql_new_passwd,
+    HASH.ORACLE: oracle_passwd,
+    HASH.ORACLE_OLD: oracle_old_passwd,
+    HASH.MD5_GENERIC: md5_generic_passwd,
+    HASH.SHA1_GENERIC: sha1_generic_passwd,
+    HASH.SHA224_GENERIC: sha224_generic_passwd,
+    HASH.SHA256_GENERIC: sha256_generic_passwd,
+    HASH.SHA384_GENERIC: sha384_generic_passwd,
+    HASH.SHA512_GENERIC: sha512_generic_passwd,
+    HASH.CRYPT_GENERIC: crypt_generic_passwd,
+    HASH.JOOMLA: joomla_passwd,
+    HASH.DJANGO_MD5: django_md5_passwd,
+    HASH.DJANGO_SHA1: django_sha1_passwd,
+    HASH.WORDPRESS: wordpress_passwd,
+    HASH.APACHE_MD5_CRYPT: unix_md5_passwd,
+    HASH.UNIX_MD5_CRYPT: unix_md5_passwd,
+    HASH.APACHE_SHA1: apache_sha1_passwd,
+    HASH.VBULLETIN: vbulletin_passwd,
+    HASH.VBULLETIN_OLD: vbulletin_passwd,
+    HASH.SSHA: ssha_passwd,
+    HASH.SSHA256: ssha256_passwd,
+    HASH.SSHA512: ssha512_passwd,
+    HASH.MD5_BASE64: md5_generic_passwd,
+    HASH.SHA1_BASE64: sha1_generic_passwd,
+    HASH.SHA256_BASE64: sha256_generic_passwd,
+    HASH.SHA512_BASE64: sha512_generic_passwd,
+}

 def storeHashesToFile(attack_dict):
    if not attack_dict:
--- a/lib/utils/htmlentities.py
+++ b/lib/utils/htmlentities.py
@@ -8,256 +8,256 @@ See the file 'LICENSE' for copying permission
 # Reference: http://www.w3.org/TR/1999/REC-html401-19991224/sgml/entities.html

 htmlEntities = {
-    'quot':   34,
-    'amp':    38,
-    'lt':     60,
-    'gt':     62,
-    'nbsp':   160,
-    'iexcl':  161,
-    'cent':   162,
-    'pound':  163,
-    'curren': 164,
-    'yen':    165,
-    'brvbar': 166,
-    'sect':   167,
-    'uml':    168,
-    'copy':   169,
-    'ordf':   170,
-    'laquo':  171,
-    'not':    172,
-    'shy':    173,
-    'reg':    174,
-    'macr':   175,
-    'deg':    176,
-    'plusmn': 177,
-    'sup2':   178,
-    'sup3':   179,
-    'acute':  180,
-    'micro':  181,
-    'para':   182,
-    'middot': 183,
-    'cedil':  184,
-    'sup1':   185,
-    'ordm':   186,
-    'raquo':  187,
-    'frac14': 188,
-    'frac12': 189,
-    'frac34': 190,
-    'iquest': 191,
-    'Agrave': 192,
-    'Aacute': 193,
-    'Acirc':  194,
-    'Atilde': 195,
-    'Auml':   196,
-    'Aring':  197,
-    'AElig':  198,
-    'Ccedil': 199,
-    'Egrave': 200,
-    'Eacute': 201,
-    'Ecirc':  202,
-    'Euml':   203,
-    'Igrave': 204,
-    'Iacute': 205,
-    'Icirc':  206,
-    'Iuml':   207,
-    'ETH':    208,
-    'Ntilde': 209,
-    'Ograve': 210,
-    'Oacute': 211,
-    'Ocirc':  212,
-    'Otilde': 213,
-    'Ouml':   214,
-    'times':  215,
-    'Oslash': 216,
-    'Ugrave': 217,
-    'Uacute': 218,
-    'Ucirc':  219,
-    'Uuml':   220,
-    'Yacute': 221,
-    'THORN':  222,
-    'szlig':  223,
-    'agrave': 224,
-    'aacute': 225,
-    'acirc':  226,
-    'atilde': 227,
-    'auml':   228,
-    'aring':  229,
-    'aelig':  230,
-    'ccedil': 231,
-    'egrave': 232,
-    'eacute': 233,
-    'ecirc':  234,
-    'euml':   235,
-    'igrave': 236,
-    'iacute': 237,
-    'icirc':  238,
-    'iuml':   239,
-    'eth':    240,
-    'ntilde': 241,
-    'ograve': 242,
-    'oacute': 243,
-    'ocirc':  244,
-    'otilde': 245,
-    'ouml':   246,
-    'divide': 247,
-    'oslash': 248,
-    'ugrave': 249,
-    'uacute': 250,
-    'ucirc':  251,
-    'uuml':   252,
-    'yacute': 253,
-    'thorn':  254,
-    'yuml':   255,
-    'OElig':  338,
-    'oelig':  339,
-    'Scaron': 352,
-    'fnof':   402,
-    'scaron': 353,
-    'Yuml':   376,
-    'circ':   710,
-    'tilde':  732,
-    'Alpha':    913,
-    'Beta':     914,
-    'Gamma':    915,
-    'Delta':    916,
-    'Epsilon':  917,
-    'Zeta':     918,
-    'Eta':      919,
-    'Theta':    920,
-    'Iota':     921,
-    'Kappa':    922,
-    'Lambda':   923,
-    'Mu':       924,
-    'Nu':       925,
-    'Xi':       926,
-    'Omicron':  927,
-    'Pi':       928,
-    'Rho':      929,
-    'Sigma':    931,
-    'Tau':      932,
-    'Upsilon':  933,
-    'Phi':      934,
-    'Chi':      935,
-    'Psi':      936,
-    'Omega':    937,
-    'alpha':    945,
-    'beta':     946,
-    'gamma':    947,
-    'delta':    948,
-    'epsilon':  949,
-    'zeta':     950,
-    'eta':      951,
-    'theta':    952,
-    'iota':     953,
-    'kappa':    954,
-    'lambda':   955,
-    'mu':       956,
-    'nu':       957,
-    'xi':       958,
-    'omicron':  959,
-    'pi':       960,
-    'rho':      961,
-    'sigmaf':   962,
-    'sigma':    963,
-    'tau':      964,
-    'upsilon':  965,
-    'phi':      966,
-    'chi':      967,
-    'psi':      968,
-    'omega':    969,
-    'thetasym': 977,
-    'upsih':    978,
-    'piv':      982,
-    'bull':    8226,
-    'hellip':  8230,
-    'prime':   8242,
-    'Prime':   8243,
-    'oline':   8254,
-    'frasl':   8260,
-    'ensp':   8194,
-    'emsp':   8195,
-    'thinsp': 8201,
-    'zwnj':   8204,
-    'zwj':    8205,
-    'lrm':    8206,
-    'rlm':    8207,
-    'ndash':  8211,
-    'mdash':  8212,
-    'lsquo':  8216,
-    'rsquo':  8217,
-    'sbquo':  8218,
-    'ldquo':  8220,
-    'rdquo':  8221,
-    'bdquo':  8222,
-    'dagger': 8224,
-    'Dagger': 8225,
-    'permil': 8240,
-    'lsaquo': 8249,
-    'rsaquo': 8250,
-    'euro':   8364,
-    'weierp':  8472,
-    'image':   8465,
-    'real':    8476,
-    'trade':   8482,
-    'alefsym': 8501,
-    'larr':   8592,
-    'uarr':   8593,
-    'rarr':   8594,
-    'darr':   8595,
-    'harr':   8596,
-    'crarr':  8629,
-    'lArr':   8656,
-    'uArr':   8657,
-    'rArr':   8658,
-    'dArr':   8659,
-    'hArr':   8660,
-    'forall': 8704,
-    'part':   8706,
-    'exist':  8707,
-    'empty':  8709,
-    'nabla':  8711,
-    'isin':   8712,
-    'notin':  8713,
-    'ni':     8715,
-    'prod':   8719,
-    'sum':    8721,
-    'minus':  8722,
-    'lowast': 8727,
-    'radic':  8730,
-    'prop':   8733,
-    'infin':  8734,
-    'ang':    8736,
-    'and':    8743,
-    'or':     8744,
-    'cap':    8745,
-    'cup':    8746,
-    'int':    8747,
-    'there4': 8756,
-    'sim':    8764,
-    'cong':   8773,
-    'asymp':  8776,
-    'ne':     8800,
-    'equiv':  8801,
-    'le':     8804,
-    'ge':     8805,
-    'sub':    8834,
-    'sup':    8835,
-    'nsub':   8836,
-    'sube':   8838,
-    'supe':   8839,
-    'oplus':  8853,
-    'otimes': 8855,
-    'perp':   8869,
-    'sdot':   8901,
-    'lceil':  8968,
-    'rceil':  8969,
-    'lfloor': 8970,
-    'rfloor': 8971,
-    'lang':   9001,
-    'rang':   9002,
-    'loz':    9674,
-    'spades': 9824,
-    'clubs':  9827,
-    'hearts': 9829,
-    'diams':  9830,
+    "quot": 34,
+    "amp": 38,
+    "lt": 60,
+    "gt": 62,
+    "nbsp": 160,
+    "iexcl": 161,
+    "cent": 162,
+    "pound": 163,
+    "curren": 164,
+    "yen": 165,
+    "brvbar": 166,
+    "sect": 167,
+    "uml": 168,
+    "copy": 169,
+    "ordf": 170,
+    "laquo": 171,
+    "not": 172,
+    "shy": 173,
+    "reg": 174,
+    "macr": 175,
+    "deg": 176,
+    "plusmn": 177,
+    "sup2": 178,
+    "sup3": 179,
+    "acute": 180,
+    "micro": 181,
+    "para": 182,
+    "middot": 183,
+    "cedil": 184,
+    "sup1": 185,
+    "ordm": 186,
+    "raquo": 187,
+    "frac14": 188,
+    "frac12": 189,
+    "frac34": 190,
+    "iquest": 191,
+    "Agrave": 192,
+    "Aacute": 193,
+    "Acirc": 194,
+    "Atilde": 195,
+    "Auml": 196,
+    "Aring": 197,
+    "AElig": 198,
+    "Ccedil": 199,
+    "Egrave": 200,
+    "Eacute": 201,
+    "Ecirc": 202,
+    "Euml": 203,
+    "Igrave": 204,
+    "Iacute": 205,
+    "Icirc": 206,
+    "Iuml": 207,
+    "ETH": 208,
+    "Ntilde": 209,
+    "Ograve": 210,
+    "Oacute": 211,
+    "Ocirc": 212,
+    "Otilde": 213,
+    "Ouml": 214,
+    "times": 215,
+    "Oslash": 216,
+    "Ugrave": 217,
+    "Uacute": 218,
+    "Ucirc": 219,
+    "Uuml": 220,
+    "Yacute": 221,
+    "THORN": 222,
+    "szlig": 223,
+    "agrave": 224,
+    "aacute": 225,
+    "acirc": 226,
+    "atilde": 227,
+    "auml": 228,
+    "aring": 229,
+    "aelig": 230,
+    "ccedil": 231,
+    "egrave": 232,
+    "eacute": 233,
+    "ecirc": 234,
+    "euml": 235,
+    "igrave": 236,
+    "iacute": 237,
+    "icirc": 238,
+    "iuml": 239,
+    "eth": 240,
+    "ntilde": 241,
+    "ograve": 242,
+    "oacute": 243,
+    "ocirc": 244,
+    "otilde": 245,
+    "ouml": 246,
+    "divide": 247,
+    "oslash": 248,
+    "ugrave": 249,
+    "uacute": 250,
+    "ucirc": 251,
+    "uuml": 252,
+    "yacute": 253,
+    "thorn": 254,
+    "yuml": 255,
+    "OElig": 338,
+    "oelig": 339,
+    "Scaron": 352,
+    "fnof": 402,
+    "scaron": 353,
+    "Yuml": 376,
+    "circ": 710,
+    "tilde": 732,
+    "Alpha": 913,
+    "Beta": 914,
+    "Gamma": 915,
+    "Delta": 916,
+    "Epsilon": 917,
+    "Zeta": 918,
+    "Eta": 919,
+    "Theta": 920,
+    "Iota": 921,
+    "Kappa": 922,
+    "Lambda": 923,
+    "Mu": 924,
+    "Nu": 925,
+    "Xi": 926,
+    "Omicron": 927,
+    "Pi": 928,
+    "Rho": 929,
+    "Sigma": 931,
+    "Tau": 932,
+    "Upsilon": 933,
+    "Phi": 934,
+    "Chi": 935,
+    "Psi": 936,
+    "Omega": 937,
+    "alpha": 945,
+    "beta": 946,
+    "gamma": 947,
+    "delta": 948,
+    "epsilon": 949,
+    "zeta": 950,
+    "eta": 951,
+    "theta": 952,
+    "iota": 953,
+    "kappa": 954,
+    "lambda": 955,
+    "mu": 956,
+    "nu": 957,
+    "xi": 958,
+    "omicron": 959,
+    "pi": 960,
+    "rho": 961,
+    "sigmaf": 962,
+    "sigma": 963,
+    "tau": 964,
+    "upsilon": 965,
+    "phi": 966,
+    "chi": 967,
+    "psi": 968,
+    "omega": 969,
+    "thetasym": 977,
+    "upsih": 978,
+    "piv": 982,
+    "bull": 8226,
+    "hellip": 8230,
+    "prime": 8242,
+    "Prime": 8243,
+    "oline": 8254,
+    "frasl": 8260,
+    "ensp": 8194,
+    "emsp": 8195,
+    "thinsp": 8201,
+    "zwnj": 8204,
+    "zwj": 8205,
+    "lrm": 8206,
+    "rlm": 8207,
+    "ndash": 8211,
+    "mdash": 8212,
+    "lsquo": 8216,
+    "rsquo": 8217,
+    "sbquo": 8218,
+    "ldquo": 8220,
+    "rdquo": 8221,
+    "bdquo": 8222,
+    "dagger": 8224,
+    "Dagger": 8225,
+    "permil": 8240,
+    "lsaquo": 8249,
+    "rsaquo": 8250,
+    "euro": 8364,
+    "weierp": 8472,
+    "image": 8465,
+    "real": 8476,
+    "trade": 8482,
+    "alefsym": 8501,
+    "larr": 8592,
+    "uarr": 8593,
+    "rarr": 8594,
+    "darr": 8595,
+    "harr": 8596,
+    "crarr": 8629,
+    "lArr": 8656,
+    "uArr": 8657,
+    "rArr": 8658,
+    "dArr": 8659,
+    "hArr": 8660,
+    "forall": 8704,
+    "part": 8706,
+    "exist": 8707,
+    "empty": 8709,
+    "nabla": 8711,
+    "isin": 8712,
+    "notin": 8713,
+    "ni": 8715,
+    "prod": 8719,
+    "sum": 8721,
+    "minus": 8722,
+    "lowast": 8727,
+    "radic": 8730,
+    "prop": 8733,
+    "infin": 8734,
+    "ang": 8736,
+    "and": 8743,
+    "or": 8744,
+    "cap": 8745,
+    "cup": 8746,
+    "int": 8747,
+    "there4": 8756,
+    "sim": 8764,
+    "cong": 8773,
+    "asymp": 8776,
+    "ne": 8800,
+    "equiv": 8801,
+    "le": 8804,
+    "ge": 8805,
+    "sub": 8834,
+    "sup": 8835,
+    "nsub": 8836,
+    "sube": 8838,
+    "supe": 8839,
+    "oplus": 8853,
+    "otimes": 8855,
+    "perp": 8869,
+    "sdot": 8901,
+    "lceil": 8968,
+    "rceil": 8969,
+    "lfloor": 8970,
+    "rfloor": 8971,
+    "lang": 9001,
+    "rang": 9002,
+    "loz": 9674,
+    "spades": 9824,
+    "clubs": 9827,
+    "hearts": 9829,
+    "diams": 9830,
 }
--- a/lib/utils/progress.py
+++ b/lib/utils/progress.py
@@ -62,8 +62,7 @@ class ProgressBar(object):
        elif numHashes == allFull:
            self._progBar = "[%s]" % ("=" * allFull)
        else:
-            self._progBar = "[%s>%s]" % ("=" * (numHashes - 1),
-                                          " " * (allFull - numHashes))
+            self._progBar = "[%s>%s]" % ("=" * (numHashes - 1), " " * (allFull - numHashes))

        # Add the percentage at the beginning of the progress bar
        percentString = getUnicode(percentDone) + "%"
--- a/lib/utils/versioncheck.py
+++ b/lib/utils/versioncheck.py
@@ -20,4 +20,4 @@ except ImportError:
    errMsg = "missing one or more core extensions (%s) " % (", ".join("'%s'" % _ for _ in extensions))
    errMsg += "most likely because current version of Python has been "
    errMsg += "built without appropriate dev packages (e.g. 'libsqlite3-dev')"
-    exit(errMsg)
+    exit(errMsg)
--- a/lib/utils/xrange.py
+++ b/lib/utils/xrange.py
@@ -69,7 +69,7 @@ class xrange(object):
        if isinstance(index, slice):
            start, stop, step = index.indices(self._len())
            return xrange(self._index(start),
-                          self._index(stop), step*self.step)
+                          self._index(stop), step * self.step)
        elif isinstance(index, (int, long)):
            if index < 0:
                fixed_index = index + self._len()