Some more drei stuff

thirdparty/beautifulsoup/beautifulsoup.py

@@ -87,6 +87,10 @@ __license__ = "New-style BSD"
 import codecs
 import types
 import re
+import sys
+
+if sys.version_info.major > 2:
+    xrange = range
 
 try:
   from htmlentitydefs import name2codepoint

thirdparty/chardet/eucjpprober.py

@@ -33,6 +33,8 @@ from .chardistribution import EUCJPDistributionAnalysis
 from .jpcntx import EUCJPContextAnalysis
 from .mbcssm import EUCJPSMModel
 
+if sys.version_info.major > 2:
+    xrange = range
 
 class EUCJPProber(MultiByteCharSetProber):
     def __init__(self):

thirdparty/chardet/mbcharsetprober.py

@@ -31,6 +31,8 @@ import sys
 from . import constants
 from .charsetprober import CharSetProber
 
+if sys.version_info.major > 2:
+    xrange = range
 
 class MultiByteCharSetProber(CharSetProber):
     def __init__(self):

thirdparty/chardet/sjisprober.py

@@ -33,6 +33,8 @@ from .jpcntx import SJISContextAnalysis
 from .mbcssm import SJISSMModel
 from . import constants
 
+if sys.version_info.major > 2:
+    xrange = range
 
 class SJISProber(MultiByteCharSetProber):
     def __init__(self):

thirdparty/chardet/utf8prober.py

@@ -25,11 +25,15 @@
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
+import sys
 from . import constants
 from .charsetprober import CharSetProber
 from .codingstatemachine import CodingStateMachine
 from .mbcssm import UTF8SMModel
 
+if sys.version_info.major > 2:
+    xrange = range
+
 ONE_CHAR_PROB = 0.5
 
 

thirdparty/clientform/clientform.py

@@ -109,6 +109,9 @@ except ImportError:
 
 import sys, types, copy, re, random
 
+if sys.version_info.major > 2:
+    xrange = range
+
 # monkeypatch to fix http://www.python.org/sf/803422 :-(
 sgmllib.charref = re.compile("&#(x?[0-9a-fA-F]+)[^0-9a-fA-F]")
 

thirdparty/fcrypt/fcrypt.py

@@ -119,8 +119,10 @@ __all__ = ['crypt']
 # ----- END fcrypt.c LICENSE -----
 
 
-import string, struct
+import string, struct, sys
 
+if sys.version_info.major > 2:
+    xrange = range
 
 _ITERATIONS = 16
 

thirdparty/gprof2dot/gprof2dot.py

@@ -29,8 +29,11 @@ import os.path
 import re
 import textwrap
 import optparse
+import sys
 import xml.parsers.expat
 
+if sys.version_info.major > 2:
+    xrange = range
 
 try:
     # Debugging helper module

thirdparty/keepalive/keepalive.py

@@ -113,7 +113,7 @@ except ImportError:
     from six.moves import urllib as _urllib
 
 import socket
-import thread
+import threading
 
 DEBUG = None
 
@@ -127,7 +127,7 @@ class ConnectionManager:
       * keep track of all existing
       """
     def __init__(self):
-        self._lock = thread.allocate_lock()
+        self._lock = threading.Lock()
         self._hostmap = {} # map hosts to a list of connections
         self._connmap = {} # map connections to host
         self._readymap = {} # map connection to ready state

thirdparty/xdot/xdot.py

@@ -29,6 +29,7 @@ import colorsys
 import time
 import re
 import optparse
+import sys
 
 import gobject
 import gtk
@@ -38,6 +39,8 @@ import cairo
 import pango
 import pangocairo
 
+if sys.version_info.major > 2:
+    xrange = range
 
 # See http://www.graphviz.org/pub/scm/graphviz-cairo/plugin/cairo/gvrender_cairo.c