summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander2016-01-06 15:33:27 +0000
committerMagnus Hagander2016-01-06 15:33:27 +0000
commitb14b34c40d3614871bf5ca258964920bb37dfdbd (patch)
tree54931f89e865f149ef2815bff4bfb44e41e9a191
parentdcdbe85712536953fbd0a694441b2c1613ba3ef1 (diff)
Fully qualify imports
-rw-r--r--pgcommitfest/commitfest/ajax.py2
-rw-r--r--pgcommitfest/commitfest/views.py6
-rw-r--r--pgcommitfest/settings.py8
-rw-r--r--pgcommitfest/urls.py48
-rw-r--r--pgcommitfest/userprofile/views.py2
5 files changed, 33 insertions, 33 deletions
diff --git a/pgcommitfest/commitfest/ajax.py b/pgcommitfest/commitfest/ajax.py
index c033027..1adf0d0 100644
--- a/pgcommitfest/commitfest/ajax.py
+++ b/pgcommitfest/commitfest/ajax.py
@@ -11,7 +11,7 @@ import socket
import urllib
import json
-from auth import user_search
+from pgcommitfest.auth import user_search
class HttpResponseServiceUnavailable(HttpResponse):
status_code = 503
diff --git a/pgcommitfest/commitfest/views.py b/pgcommitfest/commitfest/views.py
index 93bd421..f2e54d2 100644
--- a/pgcommitfest/commitfest/views.py
+++ b/pgcommitfest/commitfest/views.py
@@ -7,14 +7,14 @@ from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User
-import settings
+from django.conf import settings
from datetime import datetime
from email.mime.text import MIMEText
from email.utils import formatdate, make_msgid
-from mailqueue.util import send_mail, send_simple_mail
-from userprofile.util import UserWrapper
+from pgcommitfest.mailqueue.util import send_mail, send_simple_mail
+from pgcommitfest.userprofile.util import UserWrapper
from models import CommitFest, Patch, PatchOnCommitFest, PatchHistory, Committer
from forms import PatchForm, NewPatchForm, CommentForm, CommitFestFilterForm
diff --git a/pgcommitfest/settings.py b/pgcommitfest/settings.py
index f33c71b..d1af235 100644
--- a/pgcommitfest/settings.py
+++ b/pgcommitfest/settings.py
@@ -125,10 +125,10 @@ INSTALLED_APPS = (
'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
- 'selectable',
- 'commitfest',
- 'mailqueue',
- 'userprofile',
+ 'pgcommitfest.selectable',
+ 'pgcommitfest.commitfest',
+ 'pgcommitfest.mailqueue',
+ 'pgcommitfest.userprofile',
)
# A sample logging configuration. The only tangible logging
diff --git a/pgcommitfest/urls.py b/pgcommitfest/urls.py
index 4c2eb4e..b7648f0 100644
--- a/pgcommitfest/urls.py
+++ b/pgcommitfest/urls.py
@@ -6,38 +6,38 @@ from django.contrib import admin
admin.autodiscover()
urlpatterns = patterns('',
- url(r'^$', 'commitfest.views.home'),
- url(r'^activity(?P<rss>\.rss)?/', 'commitfest.views.activity'),
- url(r'^(\d+)/$', 'commitfest.views.commitfest'),
- url(r'^(open|inprogress)/$', 'commitfest.views.redir'),
- url(r'^(?P<cfid>\d+)/activity(?P<rss>\.rss)?/$', 'commitfest.views.activity'),
- url(r'^(\d+)/(\d+)/$', 'commitfest.views.patch'),
- url(r'^(\d+)/(\d+)/edit/$', 'commitfest.views.patchform'),
- url(r'^(\d+)/new/$', 'commitfest.views.newpatch'),
- url(r'^(\d+)/(\d+)/status/(review|author|committer)/$', 'commitfest.views.status'),
- url(r'^(\d+)/(\d+)/close/(reject|feedback|committed|next)/$', 'commitfest.views.close'),
- url(r'^(\d+)/(\d+)/reviewer/(become|remove)/$', 'commitfest.views.reviewer'),
- url(r'^(\d+)/(\d+)/committer/(become|remove)/$', 'commitfest.views.committer'),
- url(r'^(\d+)/(\d+)/(comment|review)/', 'commitfest.views.comment'),
- url(r'^(\d+)/send_email/$', 'commitfest.views.send_email'),
- url(r'^(\d+)/\d+/send_email/$', 'commitfest.views.send_email'),
- url(r'^search/$', 'commitfest.views.global_search'),
- url(r'^ajax/(\w+)/$', 'commitfest.ajax.main'),
+ url(r'^$', 'pgcommitfest.commitfest.views.home'),
+ url(r'^activity(?P<rss>\.rss)?/', 'pgcommitfest.commitfest.views.activity'),
+ url(r'^(\d+)/$', 'pgcommitfest.commitfest.views.commitfest'),
+ url(r'^(open|inprogress)/$', 'pgcommitfest.commitfest.views.redir'),
+ url(r'^(?P<cfid>\d+)/activity(?P<rss>\.rss)?/$', 'pgcommitfest.commitfest.views.activity'),
+ url(r'^(\d+)/(\d+)/$', 'pgcommitfest.commitfest.views.patch'),
+ url(r'^(\d+)/(\d+)/edit/$', 'pgcommitfest.commitfest.views.patchform'),
+ url(r'^(\d+)/new/$', 'pgcommitfest.commitfest.views.newpatch'),
+ url(r'^(\d+)/(\d+)/status/(review|author|committer)/$', 'pgcommitfest.commitfest.views.status'),
+ url(r'^(\d+)/(\d+)/close/(reject|feedback|committed|next)/$', 'pgcommitfest.commitfest.views.close'),
+ url(r'^(\d+)/(\d+)/reviewer/(become|remove)/$', 'pgcommitfest.commitfest.views.reviewer'),
+ url(r'^(\d+)/(\d+)/committer/(become|remove)/$', 'pgcommitfest.commitfest.views.committer'),
+ url(r'^(\d+)/(\d+)/(comment|review)/', 'pgcommitfest.commitfest.views.comment'),
+ url(r'^(\d+)/send_email/$', 'pgcommitfest.commitfest.views.send_email'),
+ url(r'^(\d+)/\d+/send_email/$', 'pgcommitfest.commitfest.views.send_email'),
+ url(r'^search/$', 'pgcommitfest.commitfest.views.global_search'),
+ url(r'^ajax/(\w+)/$', 'pgcommitfest.commitfest.ajax.main'),
url(r'^selectable/', include('selectable.urls')),
# Auth system integration
- (r'^(?:account/)?login/?$', 'auth.login'),
- (r'^(?:account/)?logout/?$', 'auth.logout'),
- (r'^auth_receive/$', 'auth.auth_receive'),
+ (r'^(?:account/)?login/?$', 'pgcommitfest.auth.login'),
+ (r'^(?:account/)?logout/?$', 'pgcommitfest.auth.logout'),
+ (r'^auth_receive/$', 'pgcommitfest.auth.auth_receive'),
# Account management
- (r'^account/profile/$', 'userprofile.views.userprofile'),
- (r'^account/profile/delmail/$', 'userprofile.views.deletemail'),
- (r'^account/profile/confirm/([0-9a-f]+)/$', 'userprofile.views.confirmemail'),
+ (r'^account/profile/$', 'pgcommitfest.userprofile.views.userprofile'),
+ (r'^account/profile/delmail/$', 'pgcommitfest.userprofile.views.deletemail'),
+ (r'^account/profile/confirm/([0-9a-f]+)/$', 'pgcommitfest.userprofile.views.confirmemail'),
# Examples:
- # url(r'^$', 'pgcommitfest.views.home', name='home'),
+ # url(r'^$', 'pgpgcommitfest.commitfest.views.home', name='home'),
# url(r'^pgcommitfest/', include('pgcommitfest.foo.urls')),
# Uncomment the admin/doc line below to enable admin documentation:
diff --git a/pgcommitfest/userprofile/views.py b/pgcommitfest/userprofile/views.py
index 6b7499d..75e84c8 100644
--- a/pgcommitfest/userprofile/views.py
+++ b/pgcommitfest/userprofile/views.py
@@ -8,7 +8,7 @@ from django.conf import settings
from datetime import datetime
-from mailqueue.util import send_template_mail
+from pgcommitfest.mailqueue.util import send_template_mail
from models import UserProfile, UserExtraEmail
from forms import UserProfileForm, MailForm