Skip to content

Commit

Permalink
Merge pull request #30 from krs013/master
Browse files Browse the repository at this point in the history
Absolute import in `start.py` prevents startup
  • Loading branch information
Trilarion committed Jul 31, 2017
2 parents 844934c + c6305e1 commit 6a666f0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Expand Up @@ -22,3 +22,10 @@ environment.pickle
# ours
source/imperialism_remake/data/manual
/build

# Mac
.DS_Store

# emacs
*~
\#*\#
8 changes: 4 additions & 4 deletions source/imperialism_remake/start.py
Expand Up @@ -150,10 +150,6 @@ def main():
if QtCore.QT_VERSION < 0x50500:
raise RuntimeError('Qt version of PyQt5 must be 5.5 at least.')

# fix PyQt5 exception eating
from imperialism_remake.lib import qt
qt.fix_pyqt5_exception_eating()

# Add the parent directory of the package directory to Python's search path.
# This allows the import of the 'imperialism_remake' modules.
# This is required at least for Linux distributions of Python3, since the current working
Expand All @@ -162,6 +158,10 @@ def main():
if source_directory not in sys.path:
sys.path.insert(0, source_directory)

# fix PyQt5 exception eating
from imperialism_remake.lib import qt
qt.fix_pyqt5_exception_eating()

user_folder = get_user_directory()

# if not existing, create user folder
Expand Down

0 comments on commit 6a666f0

Please sign in to comment.