More type renames

Not sure what is the best name for those

Author: Utumno

Mopy/bash/bosh/_mergeability.py

@@ -103,12 +103,12 @@ def isPBashMergeable(modInfo, minfos, reasons):
     #--New record
     lenMasters = len(modFile.tes4.masters)
     newblocks = []
-    for type,block in modFile.tops.iteritems():
+    for top_type,block in modFile.tops.iteritems():
         for record in block.getActiveRecords():
             if record.fid >> 24 >= lenMasters:
                 if record.flags1.deleted: continue #if new records exist but are deleted just skip em.
                 if not verbose: return False
-                newblocks.append(type)
+                newblocks.append(top_type)
                 break
     if newblocks: reasons.append(_(u'New record(s) in block(s): ')+u', '.join(sorted(newblocks))+u'.')
     dependent = [name.s for name, info in minfos.iteritems()

Mopy/bash/bosh/mods_metadata.py

@@ -991,15 +991,15 @@ def copyPrev(size):
                     while not ins.atEnd():
                         subprogress(ins.tell())
                         header = ins.unpackRecHeader()
-                        type,size = header.recType,header.size
-                        #(type,size,flags,fid,uint2) = ins.unpackRecHeader()
-                        if type == 'GRUP':
+                        rec_type,rec_size = header.recType,header.size
+                        #(rec_type,rec_size,flags,fid,uint2) = ins.unpackRecHeader()
+                        if rec_type == 'GRUP':
                             if header.groupType != 0:
                                 pass
                             elif header.label not in ('CELL','WRLD'):
-                                copy(size-header.__class__.rec_header_size)
+                                copy(rec_size-header.__class__.rec_header_size)
                         else:
-                            if doUDR and header.flags1 & 0x20 and type in {
+                            if doUDR and header.flags1 & 0x20 and rec_type in {
                                 'ACRE',               #--Oblivion only
                                 'ACHR','REFR',        #--Both
                                 'NAVM','PGRE','PHZD', #--Skyrim only
@@ -1008,22 +1008,22 @@ def copyPrev(size):
                                 out.seek(-header.__class__.rec_header_size,1)
                                 out.write(header.pack())
                                 changed = True
-                            if doFog and type == 'CELL':
-                                nextRecord = ins.tell() + size
+                            if doFog and rec_type == 'CELL':
+                                nextRecord = ins.tell() + rec_size
                                 while ins.tell() < nextRecord:
                                     subprogress(ins.tell())
                                     (nextType,nextSize) = ins.unpackSubHeader()
                                     copyPrev(6)
                                     if nextType != 'XCLL':
                                         copy(nextSize)
                                     else:
-                                        color,near,far,rotXY,rotZ,fade,clip = ins.unpack('=12s2f2l2f',size,'CELL.XCLL')
+                                        color,near,far,rotXY,rotZ,fade,clip = ins.unpack('=12s2f2l2f',rec_size,'CELL.XCLL')
                                         if not (near or far or clip):
                                             near = 0.0001
                                             changed = True
                                         out.write(struct_pack('=12s2f2l2f', color, near, far, rotXY, rotZ, fade, clip))
                             else:
-                                copy(size)
+                                copy(rec_size)
             #--Save
             retry = _(u'Bash encountered an error when saving %s.') + u'\n\n' \
                 + _(u'The file is in use by another process such as TES4Edit.'

Mopy/bash/brec.py

@@ -376,9 +376,10 @@ def close(self): self.out.close()
     def pack(self,format,*data):
         self.out.write(struct_pack(format, *data))
 
-    def packSub(self,type,data,*values):
+    def packSub(self, sub_rec_type, data, *values):
         """Write subrecord header and data to output stream.
-        Call using either packSub(type,data) or packSub(type,format,values).
+        Call using either packSub(sub_rec_type,data) or
+        packSub(sub_rec_type,format,values).
         Will automatically add a prefacing XXXX size subrecord to handle data
         with size > 0xFFFF."""
         try:
@@ -387,17 +388,16 @@ def packSub(self,type,data,*values):
             outWrite = self.out.write
             lenData = len(data)
             if lenData <= 0xFFFF:
-                outWrite(struct_pack('=4sH', type, lenData))
-                outWrite(data)
+                outWrite(struct_pack('=4sH', sub_rec_type, lenData))
             else:
                 outWrite(struct_pack('=4sHI', 'XXXX', 4, lenData))
-                outWrite(struct_pack('=4sH', type, 0))
-                outWrite(data)
+                outWrite(struct_pack('=4sH', sub_rec_type, 0))
+            outWrite(data)
         except Exception as e:
             print e
-            print self,type,data,values
+            print self,sub_rec_type,data,values
 
-    def packSub0(self,type,data):
+    def packSub0(self, sub_rec_type, data):
         """Write subrecord header plus zero terminated string to output
         stream."""
         if data is None: return
@@ -406,16 +406,17 @@ def packSub0(self,type,data):
         lenData = len(data) + 1
         outWrite = self.out.write
         if lenData < 0xFFFF:
-            outWrite(struct_pack('=4sH', type, lenData))
+            outWrite(struct_pack('=4sH', sub_rec_type, lenData))
         else:
             outWrite(struct_pack('=4sHI', 'XXXX', 4, lenData))
-            outWrite(struct_pack('=4sH', type, 0))
+            outWrite(struct_pack('=4sH', sub_rec_type, 0))
         outWrite(data)
         outWrite('\x00')
 
-    def packRef(self,type,fid):
+    def packRef(self, sub_rec_type, fid):
         """Write subrecord header and fid reference."""
-        if fid is not None: self.out.write(struct_pack('=4sHI', type, 4, fid))
+        if fid is not None:
+            self.out.write(struct_pack('=4sHI', sub_rec_type, 4, fid))
 
     def writeGroup(self,size,label,groupType,stamp):
         if type(label) is str: