Skip to content
Browse files

Removed imports from molly.conf.__init__ replaced with fully qualifie…

…d imports.
  • Loading branch information...
1 parent 75b497e commit fd8af2ce9b7f87c8ebcff7ba47ae206c471c0223 @davbo davbo committed Mar 26, 2012
View
2 molly/apps/search/forms.py
@@ -1,7 +1,7 @@
from django import forms
from django.utils.translation import ugettext_lazy as _
-from molly.conf import all_apps
+from molly.conf.applications import all_apps
# We can't pick up the list of applications when this module is imported, as
# that could lead to a circular import dependency.[0] Instead, wait until a
View
4 molly/apps/search/providers/application_search.py
@@ -2,7 +2,7 @@
from molly.apps.search.providers import BaseSearchProvider
-from molly.conf import all_apps
+from molly.conf.applications import all_apps
logger = logging.getLogger(__name__)
@@ -49,4 +49,4 @@ def find_applications(self):
else:
search_provider = _temp.ApplicationSearch(application)
- self.applications[application.local_name] = search_provider
+ self.applications[application.local_name] = search_provider
View
2 molly/apps/transport/views.py
@@ -7,7 +7,7 @@
from django.http import Http404
from django.template.defaultfilters import capfirst
-from molly.conf import app_by_application_name
+from molly.conf.applications import app_by_application_name
from molly.utils.views import BaseView
from molly.utils.breadcrumbs import *
View
2 molly/auth/__init__.py
@@ -1,7 +1,7 @@
from django.contrib.auth.models import User
from django.dispatch import Signal
-from molly.conf import app_by_application_name
+from molly.conf.applications import app_by_application_name
from molly.auth.models import UserIdentifier, UserSession, ExternalServiceToken
# A signal for finding out when two users were merged. First argument is the
View
2 molly/auth/models.py
@@ -8,7 +8,7 @@
from django.core.urlresolvers import reverse
from django.contrib.auth.models import User
-from molly.conf import app_by_local_name
+from molly.conf.applications import app_by_local_name
class UserIdentifier(models.Model):
user = models.ForeignKey(User)
View
2 molly/commands/site_template/celeryconfig.py
@@ -1,5 +1,5 @@
from settings import *
-from molly.conf import init_providers
+from molly.conf.applications import init_providers
# Celery configuration
View
8 molly/conf/__init__.py
@@ -1,8 +0,0 @@
-from applications import (
- app_by_local_name, app_by_application_name,
- apps_by_application_name, all_apps,
- applications, get_app, init_providers,
- has_app_by_local_name, has_app_by_application_name, has_app,
-)
-import settings
-
View
2 molly/conf/admin.py
@@ -1,5 +1,5 @@
from celery.app import current_app
-from molly.conf import init_providers
+from molly.conf.applications import init_providers
def run_now(modeladmin, request, queryset):
View
2 molly/geolocation/__init__.py
@@ -4,7 +4,7 @@
from django.conf import settings
from django.contrib.gis.geos import Point
-from molly.conf import get_app
+from molly.conf.applications import get_app
from molly.utils import haversine
from molly.geolocation.models import Geocode
View
4 molly/geolocation/context_processors.py
@@ -1,6 +1,6 @@
from datetime import datetime, timedelta
-from molly.conf import app_by_application_name
+from molly.conf.applications import app_by_application_name
def geolocation(request):
"""
@@ -41,4 +41,4 @@ def geolocation(request):
'method': request.session.get('geolocation:method'),
},
'location_error': request.GET.get('location_error'),
- }
+ }
View
1 molly/geolocation/forms.py
@@ -5,7 +5,6 @@
from django.forms.util import ErrorList
from django.utils.translation import ugettext_lazy as _
-from molly.conf import applications
from molly.geolocation import geocode, reverse_geocode
METHOD_CHOICES = (
View
2 molly/urls.py
@@ -3,7 +3,7 @@
from django.contrib import admin
from djcelery.admin import PeriodicTaskAdmin
-from molly.conf import applications, all_apps
+from molly.conf.applications import applications, all_apps
from molly.conf.admin import run_now
from molly.utils.views import ReverseView
from molly.utils.i18n import SetLanguageView, javascript_catalog

0 comments on commit fd8af2c

Please sign in to comment.
Something went wrong with that request. Please try again.