Move site manipulations to separate module

To avoid cyclic imports.
Signed-off-by: Michal Čihař <michal@cihar.com>

weblate/accounts/models.py

@@ -38,7 +38,7 @@ from django.utils.translation import LANGUAGE_SESSION_KEY
 from social.apps.django_app.default.models import UserSocialAuth
 
 from weblate.lang.models import Language
-from weblate.trans.util import get_site_url, get_site_domain
+from weblate.trans.site import get_site_url, get_site_domain
 from weblate.accounts.avatar import get_user_display
 from weblate.trans.util import report_error
 from weblate.trans.signals import user_pre_delete

weblate/trans/context_processors.py

@@ -21,7 +21,7 @@
 import weblate
 from weblate import appsettings
 from datetime import datetime
-from weblate.trans.util import get_site_url
+from weblate.trans.site import get_site_url
 from weblate.trans.models.project import Project
 from weblate.trans.models.translation import Translation
 

weblate/trans/models/project.py

@@ -32,7 +32,7 @@ import os
 import os.path
 from weblate.lang.models import Language
 from weblate.trans.mixins import PercentMixin, URLMixin, PathMixin
-from weblate.trans.util import get_site_url
+from weblate.trans.site import get_site_url
 from weblate.trans.data import data_dir
 
 

weblate/trans/models/subproject.py

@@ -37,8 +37,9 @@ from weblate.trans.formats import FILE_FORMAT_CHOICES, FILE_FORMATS, ParseError
 from weblate.trans.mixins import PercentMixin, URLMixin, PathMixin
 from weblate.trans.filelock import FileLock
 from weblate.trans.fields import RegexField
+from weblate.trans.site import get_site_url
 from weblate.trans.util import (
-    is_repo_link, get_site_url, cleanup_repo_url, cleanup_path, report_error,
+    is_repo_link, cleanup_repo_url, cleanup_path, report_error,
 )
 from weblate.trans.signals import (
     vcs_post_push, vcs_post_update, translation_post_add

weblate/trans/models/translation.py

@@ -39,9 +39,8 @@ from weblate.trans.checks import CHECKS
 from weblate.trans.models.unit import Unit
 from weblate.trans.models.unitdata import Suggestion
 from weblate.trans.signals import vcs_pre_commit, vcs_post_commit
-from weblate.trans.util import (
-    get_site_url, translation_percent, split_plural,
-)
+from weblate.trans.site import get_site_url
+from weblate.trans.util import translation_percent, split_plural
 from weblate.accounts.avatar import get_user_display
 from weblate.trans.mixins import URLMixin, PercentMixin, LoggerMixin
 from weblate.trans.boolean_sum import BooleanSum

weblate/trans/site.py

+# -*- coding: utf-8 -*-
+#
+# Copyright © 2012 - 2015 Michal Čihař <michal@cihar.com>
+#
+# This file is part of Weblate <http://weblate.org/>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from django.contrib.sites.models import Site
+from weblate.appsettings import ENABLE_HTTPS
+
+
+def get_site_domain():
+    """Returns current site domain."""
+    return Site.objects.get_current().domain
+
+
+def get_site_url(url=''):
+    '''
+    Returns root url of current site with domain.
+    '''
+    return '{0}://{1}{2}'.format(
+        'https' if ENABLE_HTTPS else 'http',
+        get_site_domain(),
+        url
+    )

weblate/trans/util.py

@@ -81,24 +81,6 @@ def is_repo_link(val):
     return val.startswith('weblate://')
 
 
-def get_site_domain():
-    """Returns current site domain."""
-    from django.contrib.sites.models import Site
-    return Site.objects.get_current().domain
-
-
-def get_site_url(url=''):
-    '''
-    Returns root url of current site with domain.
-    '''
-    from weblate.appsettings import ENABLE_HTTPS
-    return '{0}://{1}{2}'.format(
-        'https' if ENABLE_HTTPS else 'http',
-        get_site_domain(),
-        url
-    )
-
-
 def load_class(name, setting):
     '''
     Imports module and creates class given by name in string.

weblate/trans/views/api.py

@@ -26,7 +26,7 @@ from django.http import (
 
 from weblate.trans.models import SubProject
 from weblate.trans.views.helper import get_project, get_subproject
-from weblate.trans.util import get_site_url
+from weblate.trans.site import get_site_url
 
 import json
 import weblate

weblate/trans/views/dictionary.py

@@ -28,7 +28,8 @@ from django.core.urlresolvers import reverse
 
 from weblate.trans.models import Translation, Dictionary, Change
 from weblate.lang.models import Language
-from weblate.trans.util import get_site_url, report_error
+from weblate.trans.site import get_site_url
+from weblate.trans.util import report_error
 from weblate.trans.forms import WordForm, DictUploadForm, LetterForm
 from weblate.trans.views.helper import get_project
 import weblate

weblate/trans/views/widgets.py

@@ -23,7 +23,7 @@ from django.shortcuts import render, redirect
 from django.core.urlresolvers import reverse
 from django.views.decorators.cache import cache_page
 
-from weblate.trans.util import get_site_url
+from weblate.trans.site import get_site_url
 from weblate.lang.models import Language
 from weblate.trans.forms import EnageLanguageForm
 from weblate.trans.widgets import WIDGETS