Prepare moved stdlib modules for py3

This was just a simple rename with 'as' for moved stdlib modules in py3
to make it easier to port - all code changes are already done, all
that's needed to fix is the import.

ConfigParser was not changed because all that's needed is already the
import itself, 2to3 can easily take care of that.

Author: Daniel Nunes

Mopy/bash/balt.py

@@ -34,7 +34,7 @@
 from .exception import AbstractError, AccessDeniedError, ArgumentError, \
     BoltError, CancelError, SkipError, StateError
 #--Python
-import cPickle
+import cPickle as pickle  # PY3
 import textwrap
 import time
 import threading
@@ -1331,7 +1331,7 @@ def OnData(self, x, y, data):
                     self.window.OnDropFiles(x, y, self.dataFile.GetFilenames())
                 elif dtype == self.dataList.GetFormat().GetType():
                     # ListCtrl indexes
-                    data = cPickle.loads(self.dataList.GetData())
+                    data = pickle.loads(self.dataList.GetData())
                     self.window._OnDropList(x, y, data)
 
         def OnDragOver(self, x, y, dragResult):
@@ -1399,7 +1399,7 @@ def OnBeginDrag(self, event):
                     stop = index - 1
         if stop < 0: stop = self.GetItemCount()
 
-        selected = cPickle.dumps(indexes, 1)
+        selected = pickle.dumps(indexes, 1)
         ldata = wx.CustomDataObject('ListIndexes')
         ldata.SetData(selected)
 

Mopy/bash/barb.py

@@ -37,7 +37,7 @@
 the backup
 """
 
-import cPickle
+import cPickle as pickle  # PY3
 import os
 from os.path import join as jo
 
@@ -168,10 +168,10 @@ def _backup_settings(self, temp_dir):
         with temp_dir.join(u'backup.dat').open('wb') as out:
             # Bash version the settings were saved with, if this is newer
             # than the installed settings version, do not allow restore
-            cPickle.dump(bass.settings['bash.version'], out, -1)
+            pickle.dump(bass.settings['bash.version'], out, -1)
             # app version, if this doesn't match the installed settings
             # version, warn the user on restore
-            cPickle.dump(AppVersion, out, -1)
+            pickle.dump(AppVersion, out, -1)
         # create the backup archive in 7z format WITH solid compression
         # may raise StateError
         backup_dir, dest7z = self._backup_dest_file.head, self._backup_dest_file.tail
@@ -332,10 +332,10 @@ def _get_settings_versions(self):
             try:
                 with backup_dat.open('rb') as ins:
                     # version of Bash that created the backed up settings
-                    self._saved_settings_version = cPickle.load(ins)
+                    self._saved_settings_version = pickle.load(ins)
                     # version of Bash that created the backup
-                    self._settings_saved_with = cPickle.load(ins)
-            except (OSError, IOError, cPickle.UnpicklingError, EOFError):
+                    self._settings_saved_with = pickle.load(ins)
+            except (OSError, IOError, pickle.UnpicklingError, EOFError):
                 raise_bolt_error(u'Failed to read %s' % backup_dat)
         return self._saved_settings_version, self._settings_saved_with
 

Mopy/bash/bash.py

@@ -475,16 +475,16 @@ def __init__(self, msg):
             print u'   An error occurred while displaying the second error.'
 
 def _tkinter_error_dial(msg, but_kwargs):
-    import Tkinter
-    root_widget = Tkinter.Tk()
-    frame = Tkinter.Frame(root_widget)
+    import Tkinter as tkinter  # PY3
+    root_widget = tkinter.Tk()
+    frame = tkinter.Frame(root_widget)
     frame.pack()
-    button = Tkinter.Button(frame, command=root_widget.destroy, pady=15,
-                            borderwidth=5, relief=Tkinter.GROOVE, **but_kwargs)
-    button.pack(fill=Tkinter.BOTH, expand=1, side=Tkinter.BOTTOM)
-    w = Tkinter.Text(frame)
-    w.insert(Tkinter.END, msg)
-    w.config(state=Tkinter.DISABLED)
+    button = tkinter.Button(frame, command=root_widget.destroy, pady=15,
+                            borderwidth=5, relief=tkinter.GROOVE, **but_kwargs)
+    button.pack(fill=tkinter.BOTH, expand=1, side=tkinter.BOTTOM)
+    w = tkinter.Text(frame)
+    w.insert(tkinter.END, msg)
+    w.config(state=tkinter.DISABLED)
     w.pack()
     root_widget.mainloop()
 

Mopy/bash/basher/app_buttons.py

@@ -698,9 +698,9 @@ def _update_pkl(fileName=None):
         based either on a list of new eids or the gmsts in the specified mod
         file. Updated pkl file is dropped in Mopy directory."""
         #--Data base
-        import cPickle
+        import cPickle as pickle  # PY3
         try:
-            fids = cPickle.load(GPath(bush.game.pklfile).open('r'))['GMST']
+            fids = pickle.load(GPath(bush.game.pklfile).open('r'))['GMST']
             if fids:
                 maxId = max(fids.values())
             else:
@@ -735,7 +735,7 @@ def _update_pkl(fileName=None):
         #--Changes?
         if maxId > maxOld:
             outData = {'GMST': fids}
-            cPickle.dump(outData, GPath(bush.game.pklfile).open('w'))
+            pickle.dump(outData, GPath(bush.game.pklfile).open('w'))
             print _(u"%d new gmst ids written to " + bush.game.pklfile) % (
                 (maxId - maxOld),)
         else:

Mopy/bash/bolt.py

@@ -26,7 +26,7 @@
 #--Standard
 from __future__ import division
 import StringIO
-import cPickle
+import cPickle as pickle  # PY3
 import chardet
 import codecs
 import collections
@@ -38,6 +38,7 @@
 import re
 import shutil
 import stat
+import string
 import struct
 import subprocess
 import sys
@@ -50,6 +51,12 @@
 # Internal
 from . import exception
 
+# PY3
+try:
+    from urllib.parse import quote
+except ImportError:
+    from urllib import quote
+
 # structure aliases, mainly introduced to reduce uses of 'pack' and 'unpack'
 struct_pack = struct.pack
 struct_unpack = struct.unpack
@@ -1364,7 +1371,7 @@ def load(self):
                 try:
                     with path.open('rb') as ins:
                         try:
-                            firstPickle = cPickle.load(ins)
+                            firstPickle = pickle.load(ins)
                         except ValueError:
                             cor = path
                             cor_name = GPath(path.s + u' (%s)' % timestamp() +
@@ -1373,8 +1380,8 @@ def load(self):
                                 path, cor_name.tail), traceback=True)
                             continue # file corrupt - try next file
                         if firstPickle == 'VDATA2':
-                            self.vdata.update(cPickle.load(ins))
-                            self.data.update(cPickle.load(ins))
+                            self.vdata.update(pickle.load(ins))
+                            self.data.update(pickle.load(ins))
                         else:
                             raise PickleDict.Mold(path)
                     return 1 + (path == self.backup)
@@ -1394,7 +1401,7 @@ def save(self):
         self.vdata['boltPaths'] = True # needed so pre 307 versions don't blow
         with self.path.temp.open('wb') as out:
             for data in ('VDATA2',self.vdata,self.data):
-                cPickle.dump(data,out,-1)
+                pickle.dump(data,out,-1)
         self.path.untemp(doBackup=True)
         return True
 
@@ -2068,7 +2075,6 @@ class WryeText(object):
     @staticmethod
     def genHtml(ins,out=None,*cssDirs):
         """Reads a wtxt input stream and writes an html output stream."""
-        import string, urllib
         # Path or Stream? -----------------------------------------------
         if isinstance(ins,(Path,str,unicode)):
             srcPath = GPath(ins)
@@ -2116,7 +2122,7 @@ def subAnchor(match):
             # urllib will automatically take any unicode characters and escape them, so to
             # convert back to unicode for purposes of storing the string, everything will
             # be in cp1252, due to the escapings.
-            anchor = unicode(urllib.quote(reWd.sub(u'',text).encode('utf8')),'cp1252')
+            anchor = unicode(quote(reWd.sub(u'',text).encode('utf8')),'cp1252')
             count = 0
             if re.match(u'' r'\d', anchor):
                 anchor = u'_' + anchor
@@ -2160,7 +2166,7 @@ def subLink(match):
             address = text = match.group(1).strip()
             if u'|' in text:
                 (address,text) = [chunk.strip() for chunk in text.split(u'|',1)]
-                if address == u'#': address += unicode(urllib.quote(reWd.sub(u'',text).encode('utf8')),'cp1252')
+                if address == u'#': address += unicode(quote(reWd.sub(u'',text).encode('utf8')),'cp1252')
             if address.startswith(u'!'):
                 newWindow = u' target="_blank"'
                 if address == text:
@@ -2281,7 +2287,7 @@ def subLink(match):
             elif maHead:
                 lead,text = maHead.group(1,2)
                 text = re.sub(u' *=*#?$','',text.strip())
-                anchor = unicode(urllib.quote(reWd.sub(u'',text).encode('utf8')),'cp1252')
+                anchor = unicode(quote(reWd.sub(u'',text).encode('utf8')),'cp1252')
                 level = len(lead)
                 if anchorHeaders:
                     if re.match(u'' r'\d', anchor):

Mopy/bash/bosh/__init__.py

@@ -28,7 +28,7 @@
 
 # Imports ---------------------------------------------------------------------
 #--Python
-import cPickle
+import cPickle as pickle  # PY3
 import collections
 import errno
 import os
@@ -3292,7 +3292,7 @@ def _loadBakOrEmpty(delBackup=False, ignoreBackup=False):
     #--Set bass.settings ------------------------------------------------------
     try:
         bass.settings = _load()
-    except cPickle.UnpicklingError as err:
+    except pickle.UnpicklingError as err:
         msg = _(
             u"Error reading the Bash Settings database (the error is: '%s'). "
             u"This is probably not recoverable with the current file. Do you "
@@ -3302,7 +3302,7 @@ def _loadBakOrEmpty(delBackup=False, ignoreBackup=False):
         if usebck:
             try:
                 bass.settings = _loadBakOrEmpty()
-            except cPickle.UnpicklingError as err:
+            except pickle.UnpicklingError as err:
                 msg = _(
                     u"Error reading the BackupBash Settings database (the "
                     u"error is: '%s'). This is probably not recoverable with "

Mopy/bash/bosh/converters.py

@@ -24,7 +24,7 @@
 """BAIN Converters aka BCFs"""
 
 from __future__ import division
-import cPickle
+import cPickle as pickle  # PY3
 import re
 import sys
 
@@ -300,9 +300,9 @@ def _translate(s):
                         return re.sub(u'^(bolt|bosh)$', u'' r'bash.\1', s,
                                       flags=re.U)
                 translator = _Translator(stream)
-                map(self.__setattr__, self.persistBCF, cPickle.load(translator))
+                map(self.__setattr__, self.persistBCF, pickle.load(translator))
                 if fullLoad:
-                    map(self.__setattr__, self._converter_settings + self.volatile + self.addedSettings, cPickle.load(translator))
+                    map(self.__setattr__, self._converter_settings + self.volatile + self.addedSettings, pickle.load(translator))
         with self.fullPath.unicodeSafe() as converter_path:
             # Temp rename if its name wont encode correctly
             command = u'"%s" x "%s" BCF.dat -y -so -sccUTF-8' % (
@@ -313,7 +313,7 @@ def _translate(s):
     def save(self, destInstaller):
         #--Dump settings into BCF.dat
         def _dump(att, dat):
-            cPickle.dump(tuple(map(self.__getattribute__, att)), dat, -1)
+            pickle.dump(tuple(map(self.__getattribute__, att)), dat, -1)
         try:
             with bass.getTempDir().join(u'BCF.dat').open('wb') as f:
                 _dump(self.persistBCF, f)

Mopy/bash/brec.py

@@ -25,7 +25,7 @@
 """This module contains all of the basic types used to read ESP/ESM mod files.
 """
 from __future__ import division
-import cPickle
+import cPickle as pickle  # PY3
 import copy
 import os
 import re
@@ -2668,7 +2668,7 @@ def getGMSTFid(self):
             fname = bush.game.pklfile
             try:
                 with open(fname) as pkl_file:
-                    cls.Ids = cPickle.load(pkl_file)[cls.classType]
+                    cls.Ids = pickle.load(pkl_file)[cls.classType]
             except:
                 old = bolt.deprintOn
                 bolt.deprintOn = True

Mopy/bash/env.py

@@ -38,7 +38,7 @@
     DirectoryFileCollisionError, FileOperationError, NonExistentDriveError
 
 try:
-    import _winreg as winreg
+    import _winreg as winreg  # PY3
 except ImportError: # we're on linux
     winreg = None
 try:

scripts/build.py

@@ -46,18 +46,14 @@
 import sys
 import tempfile
 import zipfile
+import _winreg as winreg  # PY3
 from contextlib import contextmanager
 from distutils.dir_util import copy_tree
 
 import pygit2
 
 import utils
 
-# PY3: should be 'import winreg'
-try:
-    import winreg
-except ImportError:
-    import _winreg as winreg
 
 LOGGER = logging.getLogger(__name__)