Fix long integers for py3

Long integers don't really have a point - ints are auto-converted into
longs as needed, even literals.

Author: Daniel Nunes

Mopy/bash/ScriptParser.py

@@ -399,7 +399,6 @@ def __neg__(self): return Parser.Token(-self.tkn)
         def __pos__(self): return Parser.Token(+self.tkn)
         def __abs__(self): return abs(self.tkn)
         def __int__(self): return int(self.tkn)
-        def __long__(self): return long(self.tkn)
         def __float__(self): return float(self.tkn)
         def __str__(self): return str(self.tkn)
 

Mopy/bash/balt.py

@@ -1467,7 +1467,7 @@ def OnDropIndexes(self, indexes, newPos):
     # Ripped from Tank - _Monkey patch_ - we need a proper ListCtrl subclass
 
     def __id(self, item):
-        i = long(wx.NewId())
+        i = int(wx.NewId())
         self._item_itemId[item] = i
         self._itemId_item[i] = item
         return i

Mopy/bash/bolt.py

@@ -615,7 +615,7 @@ def strippedVersion(self):
     @property
     def crc(self):
         """Calculates and returns crc value for self."""
-        crc = 0L
+        crc = 0
         with self.open('rb') as ins:
             for block in iter(partial(ins.read, 2097152), ''):
                 crc = crc32(block, crc) # 2MB at a time, probably ok
@@ -936,13 +936,13 @@ def getNames(*names):
     #--Generation
     def __init__(self,value=0,names=None):
         """Initialize. Attrs, if present, is mapping of attribute names to indices. See getAttrs()"""
-        object.__setattr__(self,'_field',int(value) | 0L)
+        object.__setattr__(self,'_field',int(value))
         object.__setattr__(self,'_names',names or {})
 
     def __call__(self,newValue=None):
         """Returns a clone of self, optionally with new value."""
         if newValue is not None:
-            return Flags(int(newValue) | 0L,self._names)
+            return Flags(int(newValue),self._names)
         else:
             return Flags(self._field,self._names)
 
@@ -978,8 +978,8 @@ def __getitem__(self, index):
 
     def __setitem__(self,index,value):
         """Set value by index. E.g., flags[3] = True"""
-        value = ((value or 0L) and 1L) << index
-        mask = 1L << index
+        value = ((value or 0) and 1) << index
+        mask = 1 << index
         self._field = ((self._field & ~mask) | value)
 
     #--As class

Mopy/bash/bosh/__init__.py

@@ -71,7 +71,7 @@
 empty_path = GPath(u'') # evaluates to False in boolean expressions
 undefinedPaths = {GPath(u'C:\\Path\\exe.exe'), undefinedPath}
 #..Bit-and this with the fid to get the objectindex.
-oiMask = 0xFFFFFFL
+oiMask = 0xFFFFFF
 
 #--Singletons
 gameInis = None    # type: tuple[OblivionIni]

Mopy/bash/bosh/_saves.py

@@ -47,7 +47,7 @@
 class SreNPC(object):
     """NPC change record."""
     __slots__ = ('form','health','unused2','attributes','acbs','spells','factions','full','ai','skills','modifiers')
-    sre_flags = Flags(0L, Flags.getNames(
+    sre_flags = Flags(0, Flags.getNames(
         (0,'form'),
         (2,'health'),
         (3,'attributes'),
@@ -221,7 +221,7 @@ def dumpText(self,saveFile):
 # Save File -------------------------------------------------------------------
 class SaveFile(object):
     """Represents a Tes4 Save file."""
-    recordFlags = Flags(0L,Flags.getNames(
+    recordFlags = Flags(0,Flags.getNames(
         'form','baseid','moved','havocMoved','scale','allExtra','lock','owner','unk8','unk9',
         'mapMarkerFlags','hadHavokMoveFlag','unk12','unk13','unk14','unk15',
         'emptyFlag','droppedItem','doorDefaultState','doorState','teleport',
@@ -475,7 +475,7 @@ def mapper(fid):
             if fid is None: return None
             modName,object = fid
             mod = indices[modName]
-            return (long(mod) << 24 ) | long(object)
+            return (int(mod) << 24 ) | int(object)
         return mapper
 
     def getFid(self,iref,default=None):

Mopy/bash/bosh/bain.py

@@ -139,7 +139,7 @@ def calc_crcs(pending, pending_size, rootName, new_sizeCrcDate, progress):
             progress(done, progress_msg + rpFile)
             sub = bolt.SubProgress(progress, done, done + size + 1)
             sub.setFull(size + 1)
-            crc = 0L
+            crc = 0
             try:
                 with open(asFile, 'rb') as ins:
                     insTell = ins.tell
@@ -1176,7 +1176,7 @@ def _parse_archive_line(key, value):
         with archive_path.unicodeSafe() as tempArch:
             try:
                 list_archive(tempArch, _parse_archive_line)
-                self.crc = _li.cumCRC & 0xFFFFFFFFL
+                self.crc = _li.cumCRC & 0xFFFFFFFF
             except:
                 archive_msg = u"Unable to read archive '%s'." % archive_path.s
                 deprint(archive_msg, traceback=True)
@@ -1450,7 +1450,7 @@ def _refreshSource(self, progress, recalculate_project_crc):
             cumCRC += crc
             cumSize += size
         self.size = cumSize
-        self.crc = cumCRC & 0xFFFFFFFFL
+        self.crc = cumCRC & 0xFFFFFFFF
         self.project_refreshed = True
 
     def _install(self, dest_src, progress):
@@ -1847,7 +1847,7 @@ def apply_converter(self, converter, destArchive, progress, msg,
         try:
             converter.apply(destArchive, crc_installer,
                             bolt.SubProgress(progress, 0.0, 0.99),
-                            embedded=installer.crc if installer else 0L)
+                            embedded=installer.crc if installer else 0)
             #--Add the new archive to Bash
             if destArchive not in self:
                 self[destArchive] = InstallerArchive(destArchive)

Mopy/bash/bosh/converters.py

@@ -322,7 +322,7 @@ def _dump(att, dat):
             raise StateError, (u'Error creating BCF.dat:\nError: %s' % e), \
                 sys.exc_info()[2]
 
-    def apply(self, destArchive, crc_installer, progress=None, embedded=0L):
+    def apply(self, destArchive, crc_installer, progress=None, embedded=0):
         """Applies the BCF and packages the converted archive"""
         #--Prepare by fully loading the BCF and clearing temp
         self.load(True)

Mopy/bash/bosh/faces.py

@@ -32,7 +32,7 @@
 
 class PCFaces(object):
     """Package: Objects and functions for working with face data."""
-    pcf_flags = Flags(0L, Flags.getNames(
+    pcf_flags = Flags(0, Flags.getNames(
         'name', 'race', 'gender', 'hair', 'eye', 'iclass', 'stats', 'factions',
         'modifiers', 'spells'))
 
@@ -193,7 +193,7 @@ def save_getPlayerFace(saveFile):
 
     # Save Set ----------------------------------------------------------------
     @staticmethod
-    def save_setFace(saveInfo, face, pcf_flags=0L):
+    def save_setFace(saveInfo, face, pcf_flags=0):
         """DEPRECATED. Write a pcFace to a save file."""
         saveFile = SaveFile(saveInfo)
         saveFile.load()
@@ -268,7 +268,7 @@ def save_setCreatedFace(saveFile,targetid,face):
         saveFile.setRecord(npc.getTuple(fid,version))
 
     @staticmethod
-    def save_setPlayerFace(saveFile, face, pcf_flags=0L, morphFacts=None):
+    def save_setPlayerFace(saveFile, face, pcf_flags=0, morphFacts=None):
         """Write a pcFace to a save file."""
         pcf_flags = PCFaces.pcf_flags(pcf_flags)
         #--Update masters

Mopy/bash/brec.py

@@ -73,19 +73,19 @@ def strFid(fid):
 
 def genFid(modIndex,objectIndex):
     """Generates a fid from modIndex and ObjectIndex."""
-    return long(objectIndex) | (long(modIndex) << 24)
+    return int(objectIndex) | (int(modIndex) << 24)
 
 def getModIndex(fid):
     """Returns the modIndex portion of a fid."""
     return int(fid >> 24)
 
 def getObjectIndex(fid):
     """Returns the objectIndex portion of a fid."""
-    return int(fid & 0x00FFFFFFL)
+    return int(fid & 0x00FFFFFF)
 
 def getFormIndices(fid):
     """Returns tuple of modIndex and ObjectIndex of fid."""
-    return int(fid >> 24),int(fid & 0x00FFFFFFL)
+    return int(fid >> 24),int(fid & 0x00FFFFFF)
 
 # Mod I/O ---------------------------------------------------------------------
 #------------------------------------------------------------------------------
@@ -2234,7 +2234,7 @@ def dump(self,out):
 class MreRecord(object):
     """Generic Record. flags1 are game specific see comments."""
     subtype_attr = {'EDID':'eid','FULL':'full','MODL':'model'}
-    flags1_ = bolt.Flags(0L, bolt.Flags.getNames(
+    flags1_ = bolt.Flags(0, bolt.Flags.getNames(
         # {Sky}, {FNV} 0x00000000 ACTI: Collision Geometry (default)
         ( 0,'esm'), # {0x00000001}
         # {Sky}, {FNV} 0x00000004 ARMO: Not playable
@@ -2720,7 +2720,7 @@ class MreLeveledListBase(MelRecord):
           chanceNone
           flags
     """
-    _flags = bolt.Flags(0L,bolt.Flags.getNames(
+    _flags = bolt.Flags(0,bolt.Flags.getNames(
         (0, 'calcFromAllLevels'),
         (1, 'calcForEachItem'),
         (2, 'useAllSpells'),
@@ -2944,21 +2944,21 @@ class MelRaceVoices(MelStruct):
     """Set voices to zero, if equal race fid. If both are zero, then skip
     dumping."""
     def dumpData(self, record, out):
-        if record.maleVoice == record.fid: record.maleVoice = 0L
-        if record.femaleVoice == record.fid: record.femaleVoice = 0L
+        if record.maleVoice == record.fid: record.maleVoice = 0
+        if record.femaleVoice == record.fid: record.femaleVoice = 0
         if (record.maleVoice, record.femaleVoice) != (0, 0):
             MelStruct.dumpData(self, record, out)
 
 #------------------------------------------------------------------------------
 class MelScriptVars(MelGroups):
     """Handles SLSD and SCVR combos defining script variables."""
-    _var_flags = bolt.Flags(0L, bolt.Flags.getNames('is_long_or_short'))
+    _var_flags = bolt.Flags(0, bolt.Flags.getNames('is_long_or_short'))
 
     def __init__(self):
         MelGroups.__init__(self, 'script_vars',
             MelStruct('SLSD', 'I12sB7s', 'var_index',
                       ('unused1', null4 + null4 + null4),
-                      (self._var_flags, 'var_flags', 0L),
+                      (self._var_flags, 'var_flags', 0),
                       ('unused2', null4 + null3)),
             MelString('SCVR', 'var_name'),
         )

Mopy/bash/cint.py

@@ -518,10 +518,10 @@ def __hash__(self):
             return hash((self.master, self.objectID))
 
         def __getitem__(self, x):
-            return self.master if x == 0 else int(self.objectID & 0x00FFFFFFL)
+            return self.master if x == 0 else int(self.objectID & 0x00FFFFFF)
 
         def __repr__(self):
-            return u"UnvalidatedFormID('%s', 0x%06X)" % (self.master, int(self.objectID & 0x00FFFFFFL))
+            return u"UnvalidatedFormID('%s', 0x%06X)" % (self.master, int(self.objectID & 0x00FFFFFF))
 
         def Validate(self, target):
             """Unvalidated FormIDs have to be tested for each destination collection
@@ -556,7 +556,7 @@ def __hash__(self):
             return hash((None, self.objectID))
 
         def __getitem__(self, x):
-            return None if x == 0 else int(self.objectID & 0x00FFFFFFL)
+            return None if x == 0 else int(self.objectID & 0x00FFFFFF)
 
         def __repr__(self):
             return "InvalidFormID(None, 0x%06X)" % (self.objectID,)
@@ -586,10 +586,10 @@ def __hash__(self):
             return hash((self.master, self.objectID))
 
         def __getitem__(self, x):
-            return self.master if x == 0 else int(self.objectID & 0x00FFFFFFL)
+            return self.master if x == 0 else int(self.objectID & 0x00FFFFFF)
 
         def __repr__(self):
-            return u"ValidFormID('%s', 0x%06X)" % (self.master, int(self.objectID & 0x00FFFFFFL))
+            return u"ValidFormID('%s', 0x%06X)" % (self.master, int(self.objectID & 0x00FFFFFF))
 
         def Validate(self, target):
             """This FormID has already been validated for a specific collection.
@@ -645,7 +645,7 @@ def __hash__(self):
             return hash((self.shortID, None))
 
         def __getitem__(self, x):
-            return self.shortID >> 24 if x == 0 else int(self.shortID & 0x00FFFFFFL)
+            return self.shortID >> 24 if x == 0 else int(self.shortID & 0x00FFFFFF)
 
         def __repr__(self):
             return "RawFormID(0x%08X)" % (self.shortID,)
@@ -753,10 +753,10 @@ def __hash__(self):
             return hash((self.master, self.objectID))
 
         def __getitem__(self, x):
-            return self.master if x == 0 else int(self.objectID & 0x00FFFFFFL)
+            return self.master if x == 0 else int(self.objectID & 0x00FFFFFF)
 
         def __repr__(self):
-            return u"UnvalidatedActorValue('%s', 0x%06X)" % (self.master, int(self.objectID & 0x00FFFFFFL))
+            return u"UnvalidatedActorValue('%s', 0x%06X)" % (self.master, int(self.objectID & 0x00FFFFFF))
 
         def Validate(self, target):
             """Unvalidated ActorValues have to be tested for each destination collection.
@@ -792,7 +792,7 @@ def __hash__(self):
             return hash((None, self.objectID))
 
         def __getitem__(self, x):
-            return None if x == 0 else int(self.objectID & 0x00FFFFFFL)
+            return None if x == 0 else int(self.objectID & 0x00FFFFFF)
 
         def __repr__(self):
             return "InvalidActorValue(None, 0x%06X)" % (self.objectID,)
@@ -821,10 +821,10 @@ def __hash__(self):
             return hash((self.master, self.objectID))
 
         def __getitem__(self, x):
-            return self.master if x == 0 else int(self.objectID & 0x00FFFFFFL)
+            return self.master if x == 0 else int(self.objectID & 0x00FFFFFF)
 
         def __repr__(self):
-            return u"ValidActorValue('%s', 0x%06X)" % (self.master, int(self.objectID & 0x00FFFFFFL))
+            return u"ValidActorValue('%s', 0x%06X)" % (self.master, int(self.objectID & 0x00FFFFFF))
 
         def Validate(self, target):
             """This ActorValue has already been validated for a specific record.
@@ -881,7 +881,7 @@ def __hash__(self):
             return hash((self.shortID, None))
 
         def __getitem__(self, x):
-            return self.shortID >> 24 if x == 0 else int(self.shortID & 0x00FFFFFFL)
+            return self.shortID >> 24 if x == 0 else int(self.shortID & 0x00FFFFFF)
 
         def __repr__(self):
             return "RawActorValue(0x%08X)" % (self.shortID,)
@@ -993,10 +993,10 @@ def __hash__(self):
             return hash((self.master, self.objectID))
 
         def __getitem__(self, x):
-            return self.master if x == 0 else int(self.objectID & 0xFFFFFF00L)
+            return self.master if x == 0 else int(self.objectID & 0xFFFFFF00)
 
         def __repr__(self):
-            return u"UnvalidatedMGEFCode('%s', 0x%06X)" % (self.master, int(self.objectID & 0xFFFFFF00L))
+            return u"UnvalidatedMGEFCode('%s', 0x%06X)" % (self.master, int(self.objectID & 0xFFFFFF00))
 
         def Validate(self, target):
             """Unvalidated MGEFCodes have to be tested for each destination collection.
@@ -1032,7 +1032,7 @@ def __hash__(self):
             return hash((None, self.objectID))
 
         def __getitem__(self, x):
-            return None if x == 0 else int(self.objectID & 0xFFFFFF00L)
+            return None if x == 0 else int(self.objectID & 0xFFFFFF00)
 
         def __repr__(self):
             return "InvalidMGEFCode(None, 0x%06X)" % (self.objectID,)
@@ -1061,10 +1061,10 @@ def __hash__(self):
             return hash((self.master, self.objectID))
 
         def __getitem__(self, x):
-            return self.master if x == 0 else int(self.objectID & 0xFFFFFF00L)
+            return self.master if x == 0 else int(self.objectID & 0xFFFFFF00)
 
         def __repr__(self):
-            return u"ValidMGEFCode('%s', 0x%06X)" % (self.master, int(self.objectID & 0xFFFFFF00L))
+            return u"ValidMGEFCode('%s', 0x%06X)" % (self.master, int(self.objectID & 0xFFFFFF00))
 
         def Validate(self, target):
             """This MGEFCode has already been validated for a specific record.
@@ -1127,7 +1127,7 @@ def __hash__(self):
             return hash((self.shortID, None))
 
         def __getitem__(self, x):
-            return self.shortID if isinstance(self.shortID, basestring) else self.shortID >> 24 if x == 0 else int(self.shortID & 0xFFFFFF00L)
+            return self.shortID if isinstance(self.shortID, basestring) else self.shortID >> 24 if x == 0 else int(self.shortID & 0xFFFFFF00)
 
         def __repr__(self):
             return "RawMGEFCode(%s)" % (self.shortID,) if isinstance(self.shortID, basestring) else "RawMGEFCode(0x%08X)" % (self.shortID,)