Browse Source

fix imports

sisyphus
Dustin Falgout 8 years ago
parent
commit
8d7e0f8db0
  1. 5
      web-greeter/bridge/__init__.py
  2. 19
      web-greeter/greeter.py

5
web-greeter/bridge/__init__.py

@ -63,3 +63,8 @@ def user_to_dict(user):
real_name=user.get_real_name(), real_name=user.get_real_name(),
# ---->>> END DEPRECATED! <<<---- # ---->>> END DEPRECATED! <<<----
) )
from .Greeter import Greeter
from .Config import Config
from .ThemeUtils import ThemeUtils

19
web-greeter/greeter.py

@ -35,17 +35,12 @@ from whither.app import App
from whither.base.data import AttributeDict from whither.base.data import AttributeDict
# This Application # This Application
try: import resources
# PyCharm quirkiness from bridge import (
from .resources import * Config,
from .bridge.Greeter import Greeter Greeter,
from .bridge.Config import Config ThemeUtils,
from .bridge.ThemeUtils import ThemeUtils )
except ImportError:
import resources
from bridge.Greeter import Greeter
from bridge.Config import Config
from bridge.ThemeUtils import ThemeUtils
BASE_DIR = os.path.dirname(os.path.realpath(__file__)) BASE_DIR = os.path.dirname(os.path.realpath(__file__))
@ -59,7 +54,7 @@ class WebGreeter(App):
user_config = AttributeDict({}) user_config = AttributeDict({})
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__('WebGreeter', config_file=CONFIG_FILE, debug=True, *args, **kwargs) super().__init__('WebGreeter', config_file=CONFIG_FILE, debug=False, *args, **kwargs)
self.get_and_save_user_config() self.get_and_save_user_config()
self.greeter = Greeter(self.config.themes_dir) self.greeter = Greeter(self.config.themes_dir)

Loading…
Cancel
Save