From 5a82cefd5110167dad74523e45cec2a4b2fd0cfd Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@progval.net>
Date: Sat, 8 Aug 2015 23:01:02 +0200
Subject: [PATCH] Remove use of fix_long fixer.

---
 plugins/Math/plugin.py | 3 ++-
 setup.py               | 1 -
 src/commands.py        | 5 +++--
 src/ircutils.py        | 2 +-
 src/minisix.py         | 8 ++++++++
 src/utils/str.py       | 5 +++--
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/plugins/Math/plugin.py b/plugins/Math/plugin.py
index e057bf6af..46476193b 100644
--- a/plugins/Math/plugin.py
+++ b/plugins/Math/plugin.py
@@ -38,6 +38,7 @@ import string
 
 import supybot.utils as utils
 from supybot.commands import *
+import supybot.minisix as minisix
 import supybot.callbacks as callbacks
 from supybot.i18n import PluginInternationalization, internationalizeDocstring
 _ = PluginInternationalization('Math')
@@ -94,7 +95,7 @@ class Math(callbacks.Plugin):
     def _convertBaseToBase(self, number, toBase, fromBase):
         """Convert a number from any base, 2 through 36, to any other
         base, 2 through 36. Returns a string."""
-        number = long(str(number), fromBase)
+        number = minisix.long(str(number), fromBase)
         if toBase == 10:
             return str(number)
         return self._convertDecimalToBase(number, toBase)
diff --git a/setup.py b/setup.py
index 7db381dcb..679cc5abf 100644
--- a/setup.py
+++ b/setup.py
@@ -159,7 +159,6 @@ try:
 
             fixer_names = ['fix_basestring',
                     'fix_imports',
-                    'fix_long',
                     'fix_metaclass', 'fix_methodattrs',
                     'fix_numliterals',
                     'fix_types',
diff --git a/src/commands.py b/src/commands.py
index 51bccbdb5..cf1ac5b05 100644
--- a/src/commands.py
+++ b/src/commands.py
@@ -44,7 +44,8 @@ try:
 except ImportError: # Windows!
     resource = None
 
-from . import callbacks, conf, ircdb, ircmsgs, ircutils, log, utils, world
+from . import callbacks, conf, ircdb, ircmsgs, ircutils, log, minisix, \
+        utils, world
 from .i18n import PluginInternationalization, internationalizeDocstring
 _ = PluginInternationalization()
 
@@ -272,7 +273,7 @@ def getNonInt(irc, msg, args, state, type=_('non-integer value')):
 
 def getLong(irc, msg, args, state, type='long'):
     getInt(irc, msg, args, state, type)
-    state.args[-1] = long(state.args[-1])
+    state.args[-1] = minisix.long(state.args[-1])
 
 def getFloat(irc, msg, args, state, type=_('floating point number')):
     try:
diff --git a/src/ircutils.py b/src/ircutils.py
index ef7005430..566b5a73c 100644
--- a/src/ircutils.py
+++ b/src/ircutils.py
@@ -639,7 +639,7 @@ def dccIP(ip):
 
 def unDccIP(i):
     """Takes an integer DCC IP and return a normal string IP."""
-    assert isinstance(i, (int, long)), '%r is not an number.' % i
+    assert isinstance(i, minisix.integer_types), '%r is not an number.' % i
     L = []
     while len(L) < 4:
         L.append(i % 256)
diff --git a/src/minisix.py b/src/minisix.py
index eed817d34..fa1fb154d 100644
--- a/src/minisix.py
+++ b/src/minisix.py
@@ -32,9 +32,17 @@
 import sys
 
 if sys.version_info[0] >= 3:
+    PY2 = False
+    PY3 = True
     intern = sys.intern
+    integer_types = (int,)
+    long = int
 else:
+    PY2 = True
+    PY3 = False
     if isinstance(__builtins__, dict):
         intern = __builtins__['intern']
     else:
         intern = __builtins__.intern
+    integer_types = (int, long)
+    long = long
diff --git a/src/utils/str.py b/src/utils/str.py
index 9618786ab..1d0994daa 100644
--- a/src/utils/str.py
+++ b/src/utils/str.py
@@ -39,6 +39,7 @@ import time
 import string
 import textwrap
 
+from .. import minisix
 from .iter import all, any
 from .structures import TwoWayDictionary
 
@@ -411,7 +412,7 @@ def nItems(n, item, between=None):
     >>> nItems(10, 'clock', between='grandfather')
     '10 grandfather clocks'
     """
-    assert isinstance(n, int) or isinstance(n, long), \
+    assert isinstance(n, minisix.integer_types), \
            'The order of the arguments to nItems changed again, sorry.'
     if item == '<empty>':
         if between is None:
@@ -563,7 +564,7 @@ def format(s, *args, **kwargs):
                 raise ValueError('Invalid value for %%n in format: %s' % t)
         elif char == 'S':
             t = args.pop()
-            if not isinstance(t, (int, long)):
+            if not isinstance(t, minisix.integer_types):
                 raise ValueError('Invalid value for %%S in format: %s' % t)
             for suffix in ['B','KB','MB','GB','TB']:
                 if t < 1024: