Move all local absolute imports to relative

There were circular imports between bosh, parsers and record_groups that
did not happen with the absolute imports but had to be fixed with
relative imports. Everything else was pretty straightforward.

Infernio: Updated for 15, 461 and 480. Also moved all __author__s below
the imports to avoid syntax errors with __future__ imports.

Infernio: Updated for inf-wx-begone, and reorganized belt imports.

Author: Daniel Nunes

Mopy/bash/_games_lo.py

@@ -29,18 +29,18 @@
 # several older files in a directory would be useful (maybe limit to some
 # number, e.g. 5 older versions)
 
-__author__ = 'Utumno'
-
 import errno
 import re
 import time
 from collections import defaultdict
 # Local
-import bass
-import bolt
-import env
-import exception
-from localize import format_date
+from . import bass
+from . import bolt
+from . import env
+from . import exception
+from .localize import format_date
+
+__author__ = 'Utumno'
 
 def _write_plugins_txt_(path, lord, active, _star):
     try:

Mopy/bash/archives.py

@@ -25,9 +25,9 @@
 import re
 import subprocess
 
-import bass
-from bolt import startupinfo, GPath, deprint, walkdir
-from exception import StateError
+from . import bass
+from .bolt import startupinfo, GPath, deprint, walkdir
+from .exception import StateError
 
 exe7z = u'7z.exe' if os.name == u'nt' else u'7z'
 # TODO(inf) stuck it here for now - should probably go somewhere else

Mopy/bash/balt.py

@@ -25,12 +25,13 @@
 # Imports ---------------------------------------------------------------------
 from __future__ import division
 import re
-import bass # for dirs - try to avoid
+
+from . import bass # for dirs - try to avoid
 #--Localization
 #..Handled by bolt, so import that.
-import bolt
-from bolt import GPath, deprint
-from exception import AbstractError, AccessDeniedError, ArgumentError, \
+from . import bolt
+from .bolt import GPath, deprint
+from .exception import AbstractError, AccessDeniedError, ArgumentError, \
     BoltError, CancelError, SkipError, StateError
 #--Python
 import cPickle
@@ -556,7 +557,7 @@ def askNumber(parent,message,prompt=u'',title=u'',value=0,min=0,max=10000):
 
 # Message Dialogs -------------------------------------------------------------
 try:
-    import windows as _win # only import here !
+    from . import windows as _win # only import here !
     canVista = _win.TASK_DIALOG_AVAILABLE
 except ImportError: # bare linux (in wine it's imported but malfunctions)
     deprint('Importing windows.py failed', traceback=True)

Mopy/bash/barb.py

@@ -41,13 +41,13 @@
 import os
 from os.path import join as jo
 
-import archives
-import bass # for settings (duh!)
-import bolt
-import initialization
-from bass import dirs, AppVersion
-from bolt import GPath, deprint
-from exception import BoltError, StateError, raise_bolt_error
+from . import archives
+from . import bass # for settings (duh!)
+from . import bolt
+from . import initialization
+from .bass import dirs, AppVersion
+from .bolt import GPath, deprint
+from .exception import BoltError, StateError, raise_bolt_error
 
 def _init_settings_files(fsName_):
     """Construct a dict mapping directory paths to setting files. Keys are

Mopy/bash/bash.py

@@ -36,11 +36,11 @@
 import traceback
 from ConfigParser import ConfigParser
 # Local
-import bass
-import bolt
-import env
-import exception
-import localize
+from . import bass
+from . import bolt
+from . import env
+from . import exception
+from . import localize
 # NO OTHER LOCAL IMPORTS HERE (apart from the ones above) !
 basher = balt = initialization = None
 _wx = None
@@ -226,7 +226,7 @@ def _main(opts, wx_locale):
 
     :param opts: command line arguments
     :param wx_locale: The wx.Locale object that we ended up using."""
-    import barg
+    from . import barg
     bass.sys_argv = barg.convert_to_long_options(sys.argv)
 
     if opts.debug:
@@ -237,7 +237,7 @@ def _main(opts, wx_locale):
     assure_single_instance(instance)
 
     global initialization
-    import initialization
+    from . import initialization
     #--Bash installation directories, set on boot, not likely to change
     initialization.init_dirs_mopy()
 
@@ -247,7 +247,7 @@ def _main(opts, wx_locale):
         msg2 = _(u'done')
         try: print msg1
         except UnicodeError: print msg1.encode(bolt.Path.sys_fs_enc)
-        import belt # this imports bosh which imports wx (DUH)
+        from . import belt # this imports bosh which imports wx (DUH)
         bolt.WryeText.genHtml(opts.genHtml)
         try: print msg2
         except UnicodeError: print msg2.encode(bolt.Path.sys_fs_enc)
@@ -256,7 +256,7 @@ def _main(opts, wx_locale):
     # We need the Mopy dirs to initialize restore settings instance
     bash_ini_path, restore_ = u'bash.ini', None
     # import barb that does not import from bosh/balt/bush
-    import barb
+    from . import barb
     if opts.restore:
         try:
             restore_ = barb.RestoreSettings(opts.filename)
@@ -279,14 +279,14 @@ def _main(opts, wx_locale):
                 bolt.deprint(u'Failed to restore backup', traceback=True)
                 restore_.restore_ini()
                 # reset the game and ini
-                import bush
+                from . import bush
                 bush.reset_bush_globals()
                 bashIni, bush_game, game_ini_path = _detect_game(opts, u'bash.ini')
-        import bosh # this imports balt (DUH) which imports wx
+        from . import bosh # this imports balt (DUH) which imports wx
         bosh.initBosh(bashIni, game_ini_path)
         env.isUAC = env.testUAC(bush_game.gamePath.join(u'Data'))
         global basher, balt
-        import basher, balt
+        from . import basher, balt
     except (exception.BoltError, ImportError, OSError, IOError) as e:
         msg = u'\n'.join([_(u'Error! Unable to start Wrye Bash.'), u'\n', _(
             u'Please ensure Wrye Bash is correctly installed.'), u'\n',
@@ -393,7 +393,7 @@ def _detect_game(opts, backup_bash_ini):
     return bashIni, bush_game, game_ini_path
 
 def _import_bush_and_set_game(opts, bashIni):
-    import bush
+    from . import bush
     bolt.deprint(u'Searching for game to manage:')
     ret, game_icons = bush.detect_and_set_game(opts.oblivionPath, bashIni)
     if ret is not None:  # None == success

Mopy/bash/basher/gui_fomod.py

@@ -22,8 +22,6 @@
 #
 # =============================================================================
 
-__author__ = "Ganda"
-
 from collections import defaultdict
 import wx
 import wx.wizard as wiz
@@ -34,6 +32,8 @@
     LayoutOptions, TextArea, VLayout
 from ..fomod import FailedCondition, FomodInstaller
 
+__author__ = "Ganda"
+
 class WizardReturn(object):
     __slots__ = ("cancelled", "install_files", "install", "page_size", "pos")
 

Mopy/bash/bass.py

@@ -76,15 +76,15 @@ def rmTempDir():
     try:
         _tempDir.rmtree(safety=_tempDir.stail)
     except OSError:
-        from bolt import deprint
+        from .bolt import deprint
         deprint(u'Failed to remove %s' % _tempDir, traceback=True)
     _tempDir = None
 
 def newTempDir():
     """Generate a new temporary directory name, set it as the current Temp
     Dir."""
     global _tempDir
-    from bolt import Path
+    from .bolt import Path
     _tempDir = Path.tempDir()
     return _tempDir
 

Mopy/bash/belt.py

@@ -27,23 +27,21 @@
 from collections import OrderedDict
 from functools import partial
 import os
-
-import ScriptParser         # generic parser class
-import bass
-import load_order
-from ScriptParser import error
+import StringIO
+import traceback
 import wx
 import wx.wizard as wiz     # wxPython wizard class
-import bosh, balt, bolt, bush
-from balt import Image, set_event_hook, Events
+
+from . import ScriptParser         # generic parser class
+from . import balt, bass, bolt, bosh, bush, load_order
+from .balt import Image, set_event_hook, Events
 from .gui import BOTTOM, CENTER, CheckBox, GridLayout, HBoxedLayout, HLayout, \
     Label, LayoutOptions, RIGHT, Stretch, TextArea, VLayout, HyperlinkLabel
-from env import get_file_version
-import StringIO
-import traceback
+from .env import get_file_version
+from .ScriptParser import error
 
 #Translateable strings
-from bosh import OBSEIniFile
+from .bosh import OBSEIniFile
 
 EXTRA_ARGS =   _(u"Extra arguments to '%s'.")
 MISSING_ARGS = _(u"Missing arguments to '%s'.")

Mopy/bash/bolt.py

@@ -27,6 +27,7 @@
 from __future__ import division
 import StringIO
 import cPickle
+import chardet
 import codecs
 import collections
 import copy
@@ -47,8 +48,7 @@
 from functools import partial
 from itertools import chain
 # Internal
-import chardet
-import exception
+from . import exception
 
 # structure aliases, mainly introduced to reduce uses of 'pack' and 'unpack'
 struct_pack = struct.pack
@@ -598,7 +598,7 @@ def stat(self):
     @property
     def version(self):
         """File version (exe/dll) embedded in the file properties."""
-        from env import get_file_version
+        from .env import get_file_version
         return get_file_version(self._s)
 
     @property

Mopy/bash/bosh/bsa_files.py

@@ -29,8 +29,6 @@
 http://www.uesp.net/wiki/Tes5Mod:Archive_File_Format
 """
 
-__author__ = 'Utumno'
-
 import collections
 import errno
 import os
@@ -45,6 +43,8 @@
 from ..exception import BSAError, BSADecodingError, BSAFlagError, \
     BSANotImplemented
 
+__author__ = 'Utumno'
+
 _bsa_encoding = 'cp1252' # rumor has it that's the files/folders names encoding
 path_sep = u'\\'