commit 007da31780d0de514d6b36b435d2d8e900122f48 Author: hiro hiro@torproject.org Date: Fri Jun 21 14:11:11 2019 +0200

Update imports again --- gettor/__init__.py | 5 +++-- gettor/main.py | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gettor/__init__.py b/gettor/__init__.py index d63551b..edf5cad 100644 --- a/gettor/__init__.py +++ b/gettor/__init__.py @@ -9,8 +9,9 @@ the Tor Browser. (c) 2014, all entities within the AUTHORS file :license: see included LICENSE for information """ - -from ..gettor.utils import strings +import os.path +import sys +from .utils import strings

""" This is where version and available locales get loaded. diff --git a/gettor/main.py b/gettor/main.py index 0932ed5..98a2de3 100644 --- a/gettor/main.py +++ b/gettor/main.py @@ -14,14 +14,12 @@ the Tor Browser. This sets up GetTor and starts the servers running. """

-import sys - from .utils.commons import log from .utils import options + from .services import BaseService from .services.email.sendmail import Sendmail

- def run(gettor, app): """ This is GetTor's main entry point and main runtime loop.