From d387f33898f4edfb45e7938aad64c47f620aa7b3 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 22 Apr 2015 16:52:12 +0200 Subject: [PATCH] Do not rely on django yet. --- modoboa/core/commands/deploy.py | 5 ++++- modoboa/lib/api_client.py | 11 +++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modoboa/core/commands/deploy.py b/modoboa/core/commands/deploy.py index 071e6102e..794bbedfa 100644 --- a/modoboa/core/commands/deploy.py +++ b/modoboa/core/commands/deploy.py @@ -151,7 +151,10 @@ class DeployCommand(Command): """ if "all" in extensions: - official_exts = ModoAPIClient().list_extensions() + # We hardcode the API url here to avoid a loading of + # django's settings since they are not available yet... + url = "http://api.modoboa.org/" + official_exts = ModoAPIClient(url).list_extensions() extensions = [extension["name"] for extension in official_exts] pip_args = ["install"] + extensions diff --git a/modoboa/lib/api_client.py b/modoboa/lib/api_client.py index 698ce6141..c94439d3f 100644 --- a/modoboa/lib/api_client.py +++ b/modoboa/lib/api_client.py @@ -6,8 +6,6 @@ import pkg_resources import requests from requests.exceptions import RequestException -from django.conf import settings - from versionfield.constants import DEFAULT_NUMBER_BITS from versionfield.version import Version @@ -18,10 +16,11 @@ class ModoAPIClient(object): def __init__(self, api_url=None): """Constructor.""" - self._api_url = ( - settings.MODOBOA_API_URL if api_url is None - else api_url - ) + if api_url is None: + from django.conf import settings + self._api_url = settings.MODOBOA_API_URL + else: + self._api_url = api_url self._local_core_version = None self._latest_core_version = None self.changelog_url = None