Merge pull request #1 from klynton/master

Upgraded to Django 1.4.2 and changed to the new project structure.
basho-labs · Nov 25, 2012 · d226693 · d226693
2 parents a2df1f1 + 6ee2882
commit d226693
Show file tree

Hide file tree

Showing 36 changed files with 32 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ thumbnails, image metadata, user profiles, and sessions.
 The needed packages are listed in `requirements.txt`, but briefly,
 they are:
 
-* Django 1.3
+* Django 1.4.2
 * Python Imaging Library (PIL)
 * Riak Python Client (`riak`)
 * shortuuid

diff --git a/django_riak.py b/django_riak.py
@@ -31,7 +31,7 @@ def load(self):
 
     def create(self):
         while True:
-            self.session_key = self._get_new_session_key()
+            self._session_key = self._get_new_session_key()
             try:
                 self.save(must_create=True)
             except CreateError:

diff --git a/manage.py b/manage.py
@@ -1,18 +1,10 @@
 #!/usr/bin/env python
-from django.core.management import execute_manager
-import imp
-try:
-    imp.find_module('settings')  # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write(
-        "Error: Can't find the file 'settings.py' in the directory"
-        + "containing %r. It appears you've customized things.\n"
-        + "You'll have to run django-admin.py, passing it your "
-        + "settings module.\n" % __file__)
-    sys.exit(1)
-
-import settings
+import os
+import sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "riagi.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Django==1.3
+Django==1.4.2
 riak==1.5.1
 PIL==1.1.7
 shortuuid
diff --git a/__init__.py → riagi/__init__.py b/__init__.py → riagi/__init__.py
diff --git a/forms.py → riagi/forms.py b/forms.py → riagi/forms.py
diff --git a/images/__init__.py → riagi/images/__init__.py b/images/__init__.py → riagi/images/__init__.py
diff --git a/images/forms.py → riagi/images/forms.py b/images/forms.py → riagi/images/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from images.services import ImageService
+from riagi.images.services import ImageService
 
 
 class UploadForm(forms.Form):

diff --git a/images/models.py → riagi/images/models.py b/images/models.py → riagi/images/models.py
diff --git a/images/services.py → riagi/images/services.py b/images/services.py → riagi/images/services.py
@@ -108,8 +108,8 @@ def find(self, image_id, thumb=False):
             return None
 
     def find_all(self, user):
-        images = self.riak.search(settings.RIAK_METADATA_BUCKET,
-                                  "user:%s" % user).map(MAP_DOCID).run()
+        images = self.riak.search(settings.RIAK_METADATA_BUCKET, 
+            "user:%s" % user).map(MAP_DOCID).run()
         return images
 
     def create_unique_key(self, length=6):

diff --git a/images/tests.py → riagi/images/tests.py b/images/tests.py → riagi/images/tests.py
diff --git a/images/urls.py → riagi/images/urls.py b/images/urls.py → riagi/images/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import patterns, url
 
-urlpatterns = patterns('images.views',
+urlpatterns = patterns('riagi.images.views',
     url(r'^upload$', 'upload'),
     url(r'^(?P<image_id>[a-zA-Z0-9]{5,6})$', 'show'),
     url(r'^(?P<image_id>[a-zA-Z0-9]{5,6})\.[a-z]{3}$', 'fetch'),

diff --git a/images/views.py → riagi/images/views.py b/images/views.py → riagi/images/views.py
@@ -2,9 +2,9 @@
 from django.shortcuts import render_to_response, redirect, render
 from django.template import RequestContext
 
-from images.forms import UploadForm
-from images.services import ImageService, ImageError
-from users.service import UserService
+from riagi.images.forms import UploadForm
+from riagi.images.services import ImageService, ImageError
+from riagi.users.service import UserService
 
 
 def upload(request):

diff --git a/settings.py → riagi/settings.py b/settings.py → riagi/settings.py
@@ -4,6 +4,7 @@
 import pwd
 import os
 
+
 # Django settings for riagi project.
 
 if pwd.getpwuid(os.getuid())[0] == "dotcloud":
@@ -12,7 +13,7 @@
     DEBUG = False
 else:
     RIAK_HOST = "127.0.0.1"
-    RIAK_PORT = "8098"
+    RIAK_PORT = "8087"
     DEBUG = True
 
 TEMPLATE_DEBUG = DEBUG
@@ -65,7 +66,7 @@
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-ROOT_URLCONF = 'urls'
+ROOT_URLCONF = 'riagi.urls'
 
 TEMPLATE_DIRS = (
     os.path.join(os.path.dirname(__file__), "templates")
@@ -78,8 +79,8 @@
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'images',
-    'users'
+    'riagi.images',
+    'riagi.users'
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:

diff --git a/static/css/application.css → riagi/static/css/application.css b/static/css/application.css → riagi/static/css/application.css
diff --git a/static/css/screen.css → riagi/static/css/screen.css b/static/css/screen.css → riagi/static/css/screen.css
diff --git a/static/ender.js → riagi/static/ender.js b/static/ender.js → riagi/static/ender.js
diff --git a/static/images/riagi.png → riagi/static/images/riagi.png b/static/images/riagi.png → riagi/static/images/riagi.png
diff --git a/templates/500.html → riagi/templates/500.html b/templates/500.html → riagi/templates/500.html
diff --git a/templates/home.html → riagi/templates/home.html b/templates/home.html → riagi/templates/home.html
diff --git a/templates/images/index.html → riagi/templates/images/index.html b/templates/images/index.html → riagi/templates/images/index.html
diff --git a/templates/images/mine.html → riagi/templates/images/mine.html b/templates/images/mine.html → riagi/templates/images/mine.html
diff --git a/templates/images/show.html → riagi/templates/images/show.html b/templates/images/show.html → riagi/templates/images/show.html
diff --git a/templates/layout.html → riagi/templates/layout.html b/templates/layout.html → riagi/templates/layout.html
diff --git a/templates/users/login.html → riagi/templates/users/login.html b/templates/users/login.html → riagi/templates/users/login.html
diff --git a/templates/users/signup.html → riagi/templates/users/signup.html b/templates/users/signup.html → riagi/templates/users/signup.html
diff --git a/urls.py → riagi/urls.py b/urls.py → riagi/urls.py
@@ -5,7 +5,7 @@
 # admin.autodiscover()
 
 urlpatterns = patterns('',
-    url(r'^$', 'views.home'),
-    url(r'^(images|i)/', include('images.urls')),
-    url(r'^users/', include('users.urls'))
+    url(r'^$', 'riagi.views.home'),
+    url(r'^(images|i)/', include('riagi.images.urls')),
+    url(r'^users/', include('riagi.users.urls'))
 )
diff --git a/users/__init__.py → riagi/users/__init__.py b/users/__init__.py → riagi/users/__init__.py
diff --git a/users/forms.py → riagi/users/forms.py b/users/forms.py → riagi/users/forms.py
@@ -2,7 +2,7 @@
 
 from django import forms
 from django.forms.util import ErrorList
-from users.service import UserService
+from riagi.users.service import UserService
 
 
 class DivErrorList(ErrorList):

diff --git a/users/models.py → riagi/users/models.py b/users/models.py → riagi/users/models.py
diff --git a/users/service.py → riagi/users/service.py b/users/service.py → riagi/users/service.py
diff --git a/users/tests.py → riagi/users/tests.py b/users/tests.py → riagi/users/tests.py
diff --git a/users/urls.py → riagi/users/urls.py b/users/urls.py → riagi/users/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import patterns, url
 
-urlpatterns = patterns('users.views',
+urlpatterns = patterns('riagi.users.views',
     url(r'^signup$', 'signup'),
     url(r'^logout$', 'logout'),
     url(r'^login$', 'login'),

diff --git a/users/views.py → riagi/users/views.py b/users/views.py → riagi/users/views.py
@@ -2,8 +2,8 @@
 from django.shortcuts import render_to_response, redirect
 from django.template import RequestContext
 
-from users.forms import SignupForm, LoginForm
-from users.forms import DivErrorList
+from riagi.users.forms import SignupForm, LoginForm
+from riagi.users.forms import DivErrorList
 
 
 def signup(request):

diff --git a/views.py → riagi/views.py b/views.py → riagi/views.py
@@ -2,8 +2,8 @@
 from django.shortcuts import render
 from django.template import RequestContext
 
-from users.service import UserService
-from images.forms import UploadForm
+from riagi.users.service import UserService
+from riagi.images.forms import UploadForm
 
 
 def home(request):

diff --git a/wsgi.py → riagi/wsgi.py b/wsgi.py → riagi/wsgi.py
@@ -1,6 +1,6 @@
 import os
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'riagi.settings'
 
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()