Merge lp:~mhall119/youoneteeoh/rem-relative-imports into lp:youoneteeoh

[Michael Hall]

Removes relative imports and imports expecting 'u1to' as the base

Removes relative imports and imports expecting 'u1to' as the base

Unmerged revisions

19. By Michael Hall on 2012-02-06

Remove relative imports and use of u1to as the base package name

18. By Michael Hall on 2012-02-06

Add requirements file

=== modified file 'notes/models.py'
--- notes/models.py	2012-02-03 02:39:51 +0000
+++ notes/models.py	2012-02-06 13:41:18 +0000
@@ -3,7 +3,7 @@
 
 from django.db import models
 
-from u1to.shorturl import cb62
+from shorturl import cb62
 
 # Create your models here.
 class PublicNote(models.Model):

=== modified file 'notes/views.py'
--- notes/views.py	2012-02-03 02:39:51 +0000
+++ notes/views.py	2012-02-06 13:41:18 +0000
@@ -10,8 +10,8 @@
 from django.db.models import Max
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
-from u1to.utils import u1url
-from u1to.shorturl import cb62
+from utils import u1url
+from shorturl import cb62
 import json
 import xml.sax
 import types

=== modified file 'settings.py'
--- settings.py	2012-02-05 14:18:19 +0000
+++ settings.py	2012-02-06 13:41:18 +0000
@@ -102,7 +102,7 @@
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-ROOT_URLCONF = 'u1to.urls'
+ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
     os.path.join(os.path.dirname(__file__), "templates"),
@@ -122,11 +122,11 @@
     'django_oauth_client',
     'django_openid_auth',
     # humanize from django 1.4 (copied into libs)
-    'humanize',
+    'django.contrib.humanize',
     'django.contrib.markup',
-    'u1to.shorturl',
-    'u1to.uploader',
-    'u1to.notes',
+    'shorturl',
+    'uploader',
+    'notes',
 )
 
 # A sample logging configuration. The only tangible logging
@@ -157,7 +157,7 @@
 LOGIN_REDIRECT_URL = '/'
 
 AUTHENTICATION_BACKENDS = (
-            'u1to.auth.U1OpenIDBackend',
+            'auth.U1OpenIDBackend',
             'django.contrib.auth.backends.ModelBackend',
 )
 
@@ -183,7 +183,7 @@
         "content_url_base": "https://files.one.ubuntu.com"
     },
 }
-U1_SERVER = "ubuntuone-staging"
+U1_SERVER = "ubuntuone"
 
 import os
 local_settings = os.path.join(os.path.dirname(__file__), "local_settings.py")

=== modified file 'shorturl/views.py'
--- shorturl/views.py	2012-02-05 15:12:38 +0000
+++ shorturl/views.py	2012-02-06 13:41:18 +0000
@@ -18,7 +18,7 @@
 
 from . import cb62
 
-from u1to.utils import u1url
+from utils import u1url
 
 def dispatch(request, username, idx, extra):
     try:

=== modified file 'templates/frontpage.html'
--- templates/frontpage.html	2012-02-05 15:12:38 +0000
+++ templates/frontpage.html	2012-02-06 13:41:18 +0000
@@ -42,7 +42,7 @@
 <ul id="dests">
 <li><a href="{% url shorturl_index %}">get short u1.to URLs for my public files</a></li>
 <li><a href="{% url upload_index %}">Give someone else an upload URL for my personal cloud</a></li>
-<li><a href="%{ url notes_index %}">View and publish Tomboy notes synced to Ubuntu One</a></li>
+<li><a href="{% url notes_index %}">View and publish Tomboy notes synced to Ubuntu One</a></li>
 </ul>
 
 <div id="news">

=== modified file 'uploader/views.py'
--- uploader/views.py	2011-09-29 14:20:38 +0000
+++ uploader/views.py	2012-02-06 13:41:18 +0000
@@ -8,13 +8,13 @@
 from django_oauth_client.decorators import oauth_token_required
 from django_oauth_client.utils import get_client
 from django.forms import ModelForm
-from u1to.uploader.models import Uploader
+from uploader.models import Uploader
 from django.contrib.admin import widgets
 from django.template.defaultfilters import slugify
 from django.conf import settings
 
 import base64, json, urllib, datetime
-from u1to.utils import u1url
+from utils import u1url
 
 class UploaderForm(ModelForm):
     class Meta:

=== modified file 'urls.py'
--- urls.py	2012-02-05 15:12:38 +0000
+++ urls.py	2012-02-06 13:41:18 +0000
@@ -7,10 +7,10 @@
 from django.contrib import admin
 admin.autodiscover()
 
-from . import views as u1to_views
-from .shorturl import views as shorturl_views
-from .uploader import views as upload_views
-from .notes import views as notes_views
+import views as u1to_views
+from shorturl import views as shorturl_views
+from uploader import views as upload_views
+from notes import views as notes_views
 
 urlpatterns = patterns('',
     url(r'^upload/$', upload_views.index, name="upload_index"),