From 0819e15db85b85eac022ce50a977028ef9db428e Mon Sep 17 00:00:00 2001 From: Hidden Z Date: Wed, 3 Nov 2010 20:28:08 +0000 Subject: [PATCH] py-i2phosts-*: do imports from system-wide pyi2phosts --- py-i2phosts-builder | 4 ++-- py-i2phosts-checker | 6 +++--- py-i2phosts-fetcher | 6 +++--- py-i2phosts-injector | 6 +++--- py-i2phosts-maint | 6 +++--- py-i2phosts-master | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/py-i2phosts-builder b/py-i2phosts-builder index b7f7f44..b4fc3c3 100755 --- a/py-i2phosts-builder +++ b/py-i2phosts-builder @@ -35,8 +35,8 @@ else: DJANGO_PROJECT_PATH = os.path.dirname(sys.argv[0]) + '/web' sys.path.insert(1, DJANGO_PROJECT_PATH) os.environ['DJANGO_SETTINGS_MODULE'] = DJANGO_SETTINGS_MODULE -from web.postkey.models import i2phost -from web.lib.utils import validate_config +from pyi2phosts.postkey.models import i2phost +from pyi2phosts.lib.utils import validate_config # validate config validate_config(config) diff --git a/py-i2phosts-checker b/py-i2phosts-checker index a55385a..5c1a3d9 100755 --- a/py-i2phosts-checker +++ b/py-i2phosts-checker @@ -42,9 +42,9 @@ else: DJANGO_PROJECT_PATH = os.path.dirname(sys.argv[0]) + '/web' sys.path.insert(1, DJANGO_PROJECT_PATH) os.environ['DJANGO_SETTINGS_MODULE'] = DJANGO_SETTINGS_MODULE -from web.postkey.models import i2phost -from web.lib.utils import get_logger -from web.lib.utils import validate_config +from pyi2phosts.postkey.models import i2phost +from pyi2phosts.lib.utils import get_logger +from pyi2phosts.lib.utils import validate_config # validate config validate_config(config) diff --git a/py-i2phosts-fetcher b/py-i2phosts-fetcher index 5031e3a..62ee3ad 100755 --- a/py-i2phosts-fetcher +++ b/py-i2phosts-fetcher @@ -41,9 +41,9 @@ else: DJANGO_PROJECT_PATH = os.path.dirname(sys.argv[0]) + '/web' sys.path.insert(1, DJANGO_PROJECT_PATH) os.environ['DJANGO_SETTINGS_MODULE'] = DJANGO_SETTINGS_MODULE -from web.lib.utils import get_logger -from web.lib.utils import validate_config -from web.extsources.models import ExternalSource +from pyi2phosts.lib.utils import get_logger +from pyi2phosts.lib.utils import validate_config +from pyi2phosts.extsources.models import ExternalSource # validate config validate_config(config) diff --git a/py-i2phosts-injector b/py-i2phosts-injector index afbb941..6cb6c83 100755 --- a/py-i2phosts-injector +++ b/py-i2phosts-injector @@ -39,9 +39,9 @@ else: DJANGO_PROJECT_PATH = os.path.dirname(sys.argv[0]) + '/web' sys.path.insert(1, DJANGO_PROJECT_PATH) os.environ['DJANGO_SETTINGS_MODULE'] = DJANGO_SETTINGS_MODULE -from web.postkey.models import i2phost -from web.lib.validation import validate_hostname -from web.lib.validation import validate_b64hash +from pyi2phosts.postkey.models import i2phost +from pyi2phosts.lib.validation import validate_hostname +from pyi2phosts.lib.validation import validate_b64hash # determine approve hosts or not if args.approve or config.as_bool('approve'): diff --git a/py-i2phosts-maint b/py-i2phosts-maint index 9b6756a..35a162c 100755 --- a/py-i2phosts-maint +++ b/py-i2phosts-maint @@ -43,9 +43,9 @@ else: DJANGO_PROJECT_PATH = os.path.dirname(sys.argv[0]) + '/web' sys.path.insert(1, DJANGO_PROJECT_PATH) os.environ['DJANGO_SETTINGS_MODULE'] = DJANGO_SETTINGS_MODULE -from web.postkey.models import i2phost -from web.lib.utils import get_logger -from web.lib.utils import validate_config +from pyi2phosts.postkey.models import i2phost +from pyi2phosts.lib.utils import get_logger +from pyi2phosts.lib.utils import validate_config # validate config validate_config(config) diff --git a/py-i2phosts-master b/py-i2phosts-master index 922dc71..72ae5e9 100755 --- a/py-i2phosts-master +++ b/py-i2phosts-master @@ -123,8 +123,8 @@ else: DJANGO_PROJECT_PATH = os.path.dirname(sys.argv[0]) + '/web' sys.path.insert(1, DJANGO_PROJECT_PATH) os.environ['DJANGO_SETTINGS_MODULE'] = DJANGO_SETTINGS_MODULE -from web.lib.utils import get_logger -from web.lib.utils import validate_config +from pyi2phosts.lib.utils import get_logger +from pyi2phosts.lib.utils import validate_config # validate config validate_config(config)