diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-06-06 12:49:31 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-06-06 12:49:31 -0300 |
| commit | acac7e91124d59e6456d74118d144edb52675f95 (patch) | |
| tree | a45ce309d96bc75e91e7a4f7067a8b9711a56961 | |
| parent | d2eb54c4789afa780d72e80d89eb0c738ed61a33 (diff) | |
Remove unused code and move imports to the top.
| -rw-r--r-- | src/leap/bitmask/app.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py index 8d4a12ba..e25ab753 100644 --- a/src/leap/bitmask/app.py +++ b/src/leap/bitmask/app.py @@ -48,6 +48,7 @@ from functools import partial from PySide import QtCore, QtGui from leap.bitmask import __version__ as VERSION +from leap.bitmask.config import flags from leap.bitmask.gui import locale_rc # noqa - silence pylint from leap.bitmask.gui.mainwindow import MainWindow from leap.bitmask.logs.utils import get_logger @@ -139,12 +140,6 @@ def main(): logger = get_logger(debug, logfile, replace_stdout) - ############################################################# - # Given how paths and bundling works, we need to delay the imports - # of certain parts that depend on this path settings. - # So first we set all the places where standalone might be queried. - from leap.bitmask.config import flags - from leap.common.config.baseconfig import BaseConfig flags.STANDALONE = standalone flags.OFFLINE = offline flags.MAIL_LOGFILE = mail_logfile @@ -155,8 +150,6 @@ def main(): flags.CA_CERT_FILE = opts.ca_cert_file - BaseConfig.standalone = standalone - # ok, we got logging in place, we can satisfy mail plumbing requests # and show logs there. it normally will exit there if we got that path. do_mail_plumbing(opts) |