[extensions-web/django/upgrade-1.8] django: moved manage.py one level up to reflect 1.4 project layout.

From: Yuri Konotopov <ykonotopov src gnome org>
To: commits-list gnome org
Cc:
Subject: [extensions-web/django/upgrade-1.8] django: moved manage.py one level up to reflect 1.4 project layout.
Date: Mon, 24 Oct 2016 21:24:43 +0000 (UTC)
commit aed15a478f9de3da02df3c8ecb02a4e3fa032742
Author: Yuri Konotopov <ykonotopov gnome org>
Date:   Tue Oct 25 00:14:12 2016 +0300

    django: moved manage.py one level up to reflect 1.4 project layout.
    
    https://docs.djangoproject.com/en/1.8/releases/1.4/#updated-default-project-layout-and-manage-py

 bin/sweettooth-cron-update                         |    2 +-
 sweettooth/manage.py => manage.py                  |    2 +-
 sweettooth/auth/context_processors.py              |    2 +-
 sweettooth/auth/urls.py                            |    2 +-
 sweettooth/auth/views.py                           |    6 +++---
 sweettooth/errorreports/admin.py                   |    2 +-
 sweettooth/errorreports/forms.py                   |    2 +-
 sweettooth/errorreports/models.py                  |    2 +-
 sweettooth/errorreports/tests.py                   |    8 ++++----
 sweettooth/errorreports/urls.py                    |    2 +-
 sweettooth/errorreports/views.py                   |   10 +++++-----
 sweettooth/extensions/admin.py                     |    6 +++---
 sweettooth/extensions/feeds.py                     |    2 +-
 .../management/commands/indexextensions.py         |    4 ++--
 .../management/commands/populatedownloads.py       |    2 +-
 .../management/commands/regeneratemetadata.py      |    2 +-
 .../management/commands/searchextensions.py        |    4 ++--
 sweettooth/extensions/search.py                    |    4 ++--
 .../extensions/templates/extensions/comments.html  |    2 +-
 sweettooth/extensions/tests.py                     |    4 ++--
 sweettooth/extensions/urls.py                      |    2 +-
 sweettooth/extensions/views.py                     |    6 +++---
 sweettooth/ratings/__init__.py                     |    2 +-
 sweettooth/ratings/admin.py                        |    2 +-
 sweettooth/ratings/forms.py                        |    2 +-
 sweettooth/ratings/urls.py                         |    2 +-
 sweettooth/ratings/views.py                        |    6 +++---
 sweettooth/review/context_processors.py            |    2 +-
 sweettooth/review/models.py                        |    2 +-
 sweettooth/review/tests.py                         |    6 +++---
 sweettooth/review/urls.py                          |    4 ++--
 sweettooth/review/views.py                         |    8 ++++----
 sweettooth/settings.py                             |   18 +++++++++---------
 33 files changed, 66 insertions(+), 66 deletions(-)
---
diff --git a/bin/sweettooth-cron-update b/bin/sweettooth-cron-update
index 30405c2..b3e382f 100755
--- a/bin/sweettooth-cron-update
+++ b/bin/sweettooth-cron-update
@@ -12,7 +12,7 @@ sys.path.extend([os.path.join(_path, '..'),
                  os.path.join(_path, '..', 'sweettooth')])
 
 from django.db.models import Sum
-from extensions.models import Extension
+from sweettooth.extensions.models import Extension
 
 for ext in Extension.objects.all():
     data = (ext.popularity_items
diff --git a/sweettooth/manage.py b/manage.py
similarity index 70%
rename from sweettooth/manage.py
rename to manage.py
index f9726f9..802822c 100755
--- a/sweettooth/manage.py
+++ b/manage.py
@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "sweettooth.settings")
 
     from django.core.management import execute_from_command_line
 
diff --git a/sweettooth/auth/context_processors.py b/sweettooth/auth/context_processors.py
index 3d7e217..0b541bf 100644
--- a/sweettooth/auth/context_processors.py
+++ b/sweettooth/auth/context_processors.py
@@ -1,5 +1,5 @@
 
-from auth import forms
+from sweettooth.auth import forms
 
 def login_form(request):
     if request.user.is_authenticated():
diff --git a/sweettooth/auth/urls.py b/sweettooth/auth/urls.py
index 1a49c53..d2eb6b3 100644
--- a/sweettooth/auth/urls.py
+++ b/sweettooth/auth/urls.py
@@ -2,7 +2,7 @@
 from django.views.generic.base import TemplateView
 from django.conf.urls import patterns, url, include
 from django.contrib.auth.views import login, logout
-from auth import views, forms
+from sweettooth.auth import views, forms
 from registration.backends.default.views import RegistrationView
 
 urlpatterns = patterns('',
diff --git a/sweettooth/auth/views.py b/sweettooth/auth/views.py
index 3a1ecc8..9268cdc 100644
--- a/sweettooth/auth/views.py
+++ b/sweettooth/auth/views.py
@@ -5,10 +5,10 @@ from django.http import HttpResponseForbidden
 from django.shortcuts import get_object_or_404, redirect, render
 from django.views.decorators.http import require_POST
 
-from review.models import CodeReview
-from extensions.models import Extension, ExtensionVersion
+from sweettooth.review.models import CodeReview
+from sweettooth.extensions.models import Extension, ExtensionVersion
 
-from decorators import ajax_view
+from sweettooth.decorators import ajax_view
 
 def profile(request, user):
     userobj = get_object_or_404(models.User, username=user)
diff --git a/sweettooth/errorreports/admin.py b/sweettooth/errorreports/admin.py
index ae03391..9a4f99d 100644
--- a/sweettooth/errorreports/admin.py
+++ b/sweettooth/errorreports/admin.py
@@ -1,7 +1,7 @@
 
 from django.contrib import admin
 
-from errorreports.models import ErrorReport
+from sweettooth.errorreports.models import ErrorReport
 
 class ErrorReportAdmin(admin.ModelAdmin):
     list_display = 'extension', 'user'
diff --git a/sweettooth/errorreports/forms.py b/sweettooth/errorreports/forms.py
index 2795eab..3097a72 100644
--- a/sweettooth/errorreports/forms.py
+++ b/sweettooth/errorreports/forms.py
@@ -1,7 +1,7 @@
 
 from django import forms
 
-from errorreports.models import ErrorReport
+from sweettooth.errorreports.models import ErrorReport
 
 class ErrorReportForm(forms.ModelForm):
 
diff --git a/sweettooth/errorreports/models.py b/sweettooth/errorreports/models.py
index b12c38e..a64e6bf 100644
--- a/sweettooth/errorreports/models.py
+++ b/sweettooth/errorreports/models.py
@@ -2,7 +2,7 @@
 from django.contrib import auth
 from django.db import models
 from django.dispatch import Signal
-from extensions.models import Extension
+from sweettooth.extensions.models import Extension
 
 class ErrorReport(models.Model):
     comment = models.TextField(blank=True)
diff --git a/sweettooth/errorreports/tests.py b/sweettooth/errorreports/tests.py
index 462b196..23c8563 100644
--- a/sweettooth/errorreports/tests.py
+++ b/sweettooth/errorreports/tests.py
@@ -4,10 +4,10 @@ from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 from django.test import TestCase
 
-from extensions.models import Extension, ExtensionVersion, STATUS_ACTIVE
-from errorreports import models
+from sweettooth.extensions.models import Extension, ExtensionVersion, STATUS_ACTIVE
+from sweettooth.errorreports import models
 
-from testutils import BasicUserTestCase
+from sweettooth.testutils import BasicUserTestCase
 
 class SubmitErrorReportTestCase(BasicUserTestCase, TestCase):
     def test_email_sent(self):
@@ -23,7 +23,7 @@ class SubmitErrorReportTestCase(BasicUserTestCase, TestCase):
 
         comment = "YOUR EXTENSION SUCKS IT BROKE"
 
-        self.client.post(reverse('errorreports.views.report_error',
+        self.client.post(reverse('sweettooth.errorreports.views.report_error',
                                  kwargs=dict(pk=extension.pk)),
                          dict(comment=comment), follow=True)
 
diff --git a/sweettooth/errorreports/urls.py b/sweettooth/errorreports/urls.py
index cff06a9..66f80de 100644
--- a/sweettooth/errorreports/urls.py
+++ b/sweettooth/errorreports/urls.py
@@ -1,7 +1,7 @@
 
 from django.conf.urls import patterns, url
 
-from errorreports import views
+from sweettooth.errorreports import views
 
 urlpatterns = patterns('',
     url(r'^report/(?P<pk>\d+)', views.report_error),
diff --git a/sweettooth/errorreports/views.py b/sweettooth/errorreports/views.py
index d0eaf8d..18b2012 100644
--- a/sweettooth/errorreports/views.py
+++ b/sweettooth/errorreports/views.py
@@ -9,11 +9,11 @@ from django.shortcuts import redirect, render
 from django.template import Context
 from django.template.loader import render_to_string
 
-from errorreports.models import ErrorReport, error_reported
-from errorreports.forms import ErrorReportForm
-from extensions.models import Extension
+from sweettooth.errorreports.models import ErrorReport, error_reported
+from sweettooth.errorreports.forms import ErrorReportForm
+from sweettooth.extensions.models import Extension
 
-from decorators import model_view
+from sweettooth.decorators import model_view
 
 @model_view(Extension.objects.visible())
 def report_error(request, extension):
@@ -56,7 +56,7 @@ def view_error_report(request, obj):
                                                           show_email=can_see_reporter_email(request.user, 
obj)))
 
 def send_email_on_error_reported(sender, request, extension, report, **kwargs):
-    url = request.build_absolute_uri(reverse('errorreports.views.view_error_report',
+    url = request.build_absolute_uri(reverse('sweettooth.errorreports.views.view_error_report',
                                              kwargs=dict(pk=report.pk)))
 
     data = dict(extension=extension,
diff --git a/sweettooth/extensions/admin.py b/sweettooth/extensions/admin.py
index bb3c464..3a50f46 100644
--- a/sweettooth/extensions/admin.py
+++ b/sweettooth/extensions/admin.py
@@ -1,9 +1,9 @@
 
 from django.contrib import admin
 
-from extensions.models import Extension, ExtensionVersion
-from extensions.models import STATUS_ACTIVE, STATUS_REJECTED
-from review.models import CodeReview
+from sweettooth.extensions.models import Extension, ExtensionVersion
+from sweettooth.extensions.models import STATUS_ACTIVE, STATUS_REJECTED
+from sweettooth.review.models import CodeReview
 
 class CodeReviewAdmin(admin.TabularInline):
     model = CodeReview
diff --git a/sweettooth/extensions/feeds.py b/sweettooth/extensions/feeds.py
index c98d675..53a6a6c 100644
--- a/sweettooth/extensions/feeds.py
+++ b/sweettooth/extensions/feeds.py
@@ -1,6 +1,6 @@
 
 from django.contrib.syndication.views import Feed
-from extensions.models import Extension
+from sweettooth.extensions.models import Extension
 
 class LatestExtensionsFeed(Feed):
     title = "Latest extensions in GNOME Shell Extensions"
diff --git a/sweettooth/extensions/management/commands/indexextensions.py 
b/sweettooth/extensions/management/commands/indexextensions.py
index 5d59f83..81c071f 100644
--- a/sweettooth/extensions/management/commands/indexextensions.py
+++ b/sweettooth/extensions/management/commands/indexextensions.py
@@ -1,7 +1,7 @@
 
 from django.core.management.base import BaseCommand
-from extensions.models import Extension
-from extensions.search import index_extension
+from sweettooth.extensions.models import Extension
+from sweettooth.extensions.search import index_extension
 
 class Command(BaseCommand):
     args = ''
diff --git a/sweettooth/extensions/management/commands/populatedownloads.py 
b/sweettooth/extensions/management/commands/populatedownloads.py
index 0e86dc0..73d558f 100644
--- a/sweettooth/extensions/management/commands/populatedownloads.py
+++ b/sweettooth/extensions/management/commands/populatedownloads.py
@@ -1,6 +1,6 @@
 
 from django.core.management.base import BaseCommand, CommandError
-from extensions.models import Extension
+from sweettooth.extensions.models import Extension
 
 class Command(BaseCommand):
     args = 'downnload_data [download_data ...]'
diff --git a/sweettooth/extensions/management/commands/regeneratemetadata.py 
b/sweettooth/extensions/management/commands/regeneratemetadata.py
index 136030c..329dbb0 100644
--- a/sweettooth/extensions/management/commands/regeneratemetadata.py
+++ b/sweettooth/extensions/management/commands/regeneratemetadata.py
@@ -1,5 +1,5 @@
 from django.core.management.base import BaseCommand, CommandError
-from extensions.models import ExtensionVersion
+from sweettooth.extensions.models import ExtensionVersion
 
 class Command(BaseCommand):
     args = ''
diff --git a/sweettooth/extensions/management/commands/searchextensions.py 
b/sweettooth/extensions/management/commands/searchextensions.py
index 93f32c5..45c9936 100644
--- a/sweettooth/extensions/management/commands/searchextensions.py
+++ b/sweettooth/extensions/management/commands/searchextensions.py
@@ -1,7 +1,7 @@
 
 from django.core.management.base import BaseCommand, make_option
-from extensions.models import Extension
-from extensions.search import enquire
+from sweettooth.extensions.models import Extension
+from sweettooth.extensions.search import enquire
 
 def append_version(option, opt_str, value, parser):
     values = parser.values
diff --git a/sweettooth/extensions/search.py b/sweettooth/extensions/search.py
index 7e05fed..4bc919e 100644
--- a/sweettooth/extensions/search.py
+++ b/sweettooth/extensions/search.py
@@ -4,8 +4,8 @@ import xapian
 from django.conf import settings
 from django.db.models import signals
 
-from extensions.models import Extension, ExtensionVersion
-from extensions.models import reviewed, extension_updated
+from sweettooth.extensions.models import Extension, ExtensionVersion
+from sweettooth.extensions.models import reviewed, extension_updated
 
 def index_extension(extension):
     if extension.latest_version is None:
diff --git a/sweettooth/extensions/templates/extensions/comments.html 
b/sweettooth/extensions/templates/extensions/comments.html
index db7717e..9bf24e6 100644
--- a/sweettooth/extensions/templates/extensions/comments.html
+++ b/sweettooth/extensions/templates/extensions/comments.html
@@ -10,7 +10,7 @@
     Leave a...
     <a href="javascript:void 0" id="leave_comment">Comment</a>
     <a href="javascript:void 0" id="leave_rating">Rating</a>
-    <a href="{% url 'errorreports.views.report_error' pk=extension.pk %}">Bug report</a>
+    <a href="{% url 'sweettooth.errorreports.views.report_error' pk=extension.pk %}">Bug report</a>
   </div>
   <div id="rating_form">
     {% load comments %}
diff --git a/sweettooth/extensions/tests.py b/sweettooth/extensions/tests.py
index a2d98aa..5674f17 100644
--- a/sweettooth/extensions/tests.py
+++ b/sweettooth/extensions/tests.py
@@ -14,9 +14,9 @@ except ImportError:
 from django.test import TestCase, TransactionTestCase
 from django.core.files.base import File
 from django.core.urlresolvers import reverse
-from extensions import models
+from sweettooth.extensions import models
 
-from testutils import BasicUserTestCase
+from sweettooth.testutils import BasicUserTestCase
 
 testdata_dir = os.path.join(os.path.dirname(__file__), 'testdata')
 
diff --git a/sweettooth/extensions/urls.py b/sweettooth/extensions/urls.py
index 355c034..6cc1c03 100644
--- a/sweettooth/extensions/urls.py
+++ b/sweettooth/extensions/urls.py
@@ -2,7 +2,7 @@
 from django.conf.urls import patterns, include, url
 from django.views.generic.base import TemplateView
 
-from extensions import views, models, feeds
+from sweettooth.extensions import views, models, feeds
 
 ajax_patterns = patterns('',
     url(r'^edit/(?P<pk>\d+)', views.ajax_inline_edit_view, name='extensions-ajax-inline'),
diff --git a/sweettooth/extensions/views.py b/sweettooth/extensions/views.py
index 39b8d31..4f023d4 100644
--- a/sweettooth/extensions/views.py
+++ b/sweettooth/extensions/views.py
@@ -13,10 +13,10 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.template.loader import render_to_string
 from django.views.decorators.http import require_POST
 
-from extensions import models, search
-from extensions.forms import UploadForm
+from sweettooth.extensions import models, search
+from sweettooth.extensions.forms import UploadForm
 
-from decorators import ajax_view, model_view
+from sweettooth.decorators import ajax_view, model_view
 
 def get_versions_for_version_strings(version_strings):
     def get_version(major, minor, point):
diff --git a/sweettooth/ratings/__init__.py b/sweettooth/ratings/__init__.py
index 78f997b..735f567 100644
--- a/sweettooth/ratings/__init__.py
+++ b/sweettooth/ratings/__init__.py
@@ -1,5 +1,5 @@
 
-from ratings import models, forms
+from sweettooth.ratings import models, forms
 
 def get_model():
     return models.RatingComment
diff --git a/sweettooth/ratings/admin.py b/sweettooth/ratings/admin.py
index 44baca8..348d501 100644
--- a/sweettooth/ratings/admin.py
+++ b/sweettooth/ratings/admin.py
@@ -3,7 +3,7 @@ from django.contrib import admin
 from django.contrib.comments.admin import CommentsAdmin
 from django.utils.translation import ugettext_lazy as _
 
-from ratings.models import RatingComment
+from sweettooth.ratings.models import RatingComment
 
 class RatingCommentsAdmin(CommentsAdmin):
     fieldsets = (
diff --git a/sweettooth/ratings/forms.py b/sweettooth/ratings/forms.py
index fd3a30c..725de96 100644
--- a/sweettooth/ratings/forms.py
+++ b/sweettooth/ratings/forms.py
@@ -8,7 +8,7 @@ from django.contrib.comments.forms import CommentForm
 from django.utils.encoding import StrAndUnicode, force_unicode
 from django.utils.safestring import mark_safe
 
-from ratings.models import RatingComment
+from sweettooth.ratings.models import RatingComment
 
 # Raty inserts its own <input> element, so we don't want to provide
 # a widget here. We'll insert a <div> for raty to fill in the template.
diff --git a/sweettooth/ratings/urls.py b/sweettooth/ratings/urls.py
index 1d6a952..c8ecc33 100644
--- a/sweettooth/ratings/urls.py
+++ b/sweettooth/ratings/urls.py
@@ -1,6 +1,6 @@
 
 from django.conf.urls import patterns, include, url
-from ratings import views
+from sweettooth.ratings import views
 
 urlpatterns = patterns('',
     url(r'^posted/$', views.comment_done, name='comments-comment-done'),
diff --git a/sweettooth/ratings/views.py b/sweettooth/ratings/views.py
index 6a4e394..6442640 100644
--- a/sweettooth/ratings/views.py
+++ b/sweettooth/ratings/views.py
@@ -7,9 +7,9 @@ from django.contrib.messages import info
 from django.shortcuts import redirect
 from django.utils.dateformat import format as format_date
 
-from extensions import models
-from decorators import ajax_view, model_view
-from utils import gravatar_url
+from sweettooth.extensions import models
+from sweettooth.decorators import ajax_view, model_view
+from sweettooth.utils import gravatar_url
 
 def comment_done(request):
     pk = request.GET['c']
diff --git a/sweettooth/review/context_processors.py b/sweettooth/review/context_processors.py
index 1a0cf91..7e971c7 100644
--- a/sweettooth/review/context_processors.py
+++ b/sweettooth/review/context_processors.py
@@ -1,5 +1,5 @@
 
-from extensions.models import ExtensionVersion
+from sweettooth.extensions.models import ExtensionVersion
 
 def n_unreviewed_extensions(request):
     if not request.user.has_perm("review.can-review-extensions"):
diff --git a/sweettooth/review/models.py b/sweettooth/review/models.py
index f352553..3dd1255 100644
--- a/sweettooth/review/models.py
+++ b/sweettooth/review/models.py
@@ -3,7 +3,7 @@ from django.contrib.auth.models import User, Permission, Group
 from django.db import models
 from django.db.models import Q
 
-from extensions.models import ExtensionVersion, STATUSES
+from sweettooth.extensions.models import ExtensionVersion, STATUSES
 
 def get_all_reviewers():
     perm = Permission.objects.get(codename="can-review-extensions")
diff --git a/sweettooth/review/tests.py b/sweettooth/review/tests.py
index 90e7f8d..f67c40d 100644
--- a/sweettooth/review/tests.py
+++ b/sweettooth/review/tests.py
@@ -2,10 +2,10 @@
 from django.test import TestCase
 from django.core.files.base import File, ContentFile, StringIO
 
-from extensions import models
-from review.views import get_old_version, should_auto_approve_changeset
+from sweettooth.extensions import models
+from sweettooth.review.views import get_old_version, should_auto_approve_changeset
 
-from testutils import BasicUserTestCase
+from sweettooth.testutils import BasicUserTestCase
 
 from difftests import DiffTest
 
diff --git a/sweettooth/review/urls.py b/sweettooth/review/urls.py
index 6cab221..885cfd8 100644
--- a/sweettooth/review/urls.py
+++ b/sweettooth/review/urls.py
@@ -2,8 +2,8 @@
 from django.conf.urls import patterns, url
 from django.views.generic.list import ListView
 
-from extensions.models import ExtensionVersion
-from review import views
+from sweettooth.extensions.models import ExtensionVersion
+from sweettooth.review import views
 
 urlpatterns = patterns('',
     url(r'^$', ListView.as_view(template_name='review/list.html',
diff --git a/sweettooth/review/views.py b/sweettooth/review/views.py
index aeaa674..6635135 100644
--- a/sweettooth/review/views.py
+++ b/sweettooth/review/views.py
@@ -16,11 +16,11 @@ from django.template import Context
 from django.template.loader import render_to_string
 from django.views.decorators.http import require_POST
 
-from review.diffutils import get_chunks
-from review.models import CodeReview, get_all_reviewers
-from extensions import models
+from sweettooth.review.diffutils import get_chunks
+from sweettooth.review.models import CodeReview, get_all_reviewers
+from sweettooth.extensions import models
 
-from decorators import ajax_view, model_view
+from sweettooth.decorators import ajax_view, model_view
 
 IMAGE_TYPES = {
     '.png':  'image/png',
diff --git a/sweettooth/settings.py b/sweettooth/settings.py
index b8a8057..5213094 100644
--- a/sweettooth/settings.py
+++ b/sweettooth/settings.py
@@ -84,7 +84,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-ROOT_URLCONF = 'urls'
+ROOT_URLCONF = 'sweettooth.urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -100,8 +100,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.media",
     "django.core.context_processors.request",
     "django.contrib.messages.context_processors.messages",
-    "review.context_processors.n_unreviewed_extensions",
-    "auth.context_processors.login_form",
+    "sweettooth.review.context_processors.n_unreviewed_extensions",
+    "sweettooth.auth.context_processors.login_form",
 )
 
 ACCOUNT_ACTIVATION_DAYS = 5
@@ -115,7 +115,7 @@ INSTALLED_APPS = (
 
     # 'ratings' goes before django's comments
     # app so it will find our templates
-    'ratings',
+    'sweettooth.ratings',
 
     'django.contrib.comments',
     'django.contrib.contenttypes',
@@ -124,10 +124,10 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.messages',
 
-    'extensions',
-    'auth',
-    'review',
-    'errorreports',
+    'sweettooth.extensions',
+    'sweettooth.auth',
+    'sweettooth.review',
+    'sweettooth.errorreports',
 
     # Uncomment the next line to enable the admin:
     'django.contrib.admin',
@@ -137,7 +137,7 @@ INSTALLED_APPS = (
     'south',
 )
 
-COMMENTS_APP = 'ratings'
+COMMENTS_APP = 'sweettooth.ratings'
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]