Stripped import paths to exclude proj dir.

shanx · Mar 9, 2011 · 6583ed2 · 6583ed2
1 parent 1cd5160
commit 6583ed2
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 16 deletions.
diff --git a/blog/admin.py b/blog/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from djangocon.blog.models import Post
+from blog.models import Post
 
 class BlogPostAdmin(admin.ModelAdmin):
     list_display = ('author', 'draft', 'title', 'publish_date',)

diff --git a/blog/feeds.py b/blog/feeds.py
@@ -1,6 +1,6 @@
 from django.contrib.syndication.feeds import Feed
 
-from djangocon.blog.models import Post
+from blog.models import Post
 
 class LatestBlogPostFeed(Feed):
     title = 'djangocon.eu'

diff --git a/blog/models.py b/blog/models.py
@@ -6,7 +6,7 @@
 
 from markdown import markdown
 from smartypants import smartyPants
-from djangocon.utils.models import DateAwareModel
+from utils.models import DateAwareModel
 
 
 class PublicManager(models.Manager):

diff --git a/blog/urls.py b/blog/urls.py
@@ -1,9 +1,9 @@
 from django.conf.urls.defaults import *
 
-from djangocon.blog.models import Post
-from djangocon.blog.feeds import LatestBlogPostFeed
+from blog.models import Post
+from blog.feeds import LatestBlogPostFeed
 
-urlpatterns = patterns('djangocon.blog.views',
+urlpatterns = patterns('blog.views',
     url(r'^$', 'blog', name='blog'),
     url(r'^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>[-\w]+)/$',
         'blogpost_detail', name='blogpost_detail'),

diff --git a/blog/views.py b/blog/views.py
@@ -1,7 +1,7 @@
 from django.views.decorators.cache import cache_page
 from django.views.generic import date_based, list_detail
 
-from djangocon.blog.models import Post
+from blog.models import Post
 
 @cache_page(60*5) # Cache for 5min.
 def blogpost_detail(request, year, month, day, slug):

diff --git a/core/urls.py b/core/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('djangocon.core.views',
+urlpatterns = patterns('core.views',
     url(r'^$', 'placeholder', name='placeholder'),
 )
 

diff --git a/core/views.py b/core/views.py
@@ -1,6 +1,6 @@
 from django.views.decorators.cache import cache_page
 from django.views.generic.simple import direct_to_template as render
-from djangocon.subscribers.forms import SubscriberForm
+from subscribers.forms import SubscriberForm
 
 @cache_page(60*60) # Cache for 1hr.
 def placeholder(

diff --git a/subscribers/admin.py b/subscribers/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from djangocon.subscribers.models import Subscriber
+from subscribers.models import Subscriber
 
 class SubscriberAdmin(admin.ModelAdmin):
     list_display = ('email', 'timestamp')

diff --git a/subscribers/forms.py b/subscribers/forms.py
@@ -1,7 +1,7 @@
 from django import forms
 
-from djangocon.utils.html5widgets import EmailInput
-from djangocon.subscribers.models import Subscriber
+from utils.html5widgets import EmailInput
+from subscribers.models import Subscriber
 
 class SubscriberForm(forms.ModelForm):
     class Meta:

diff --git a/subscribers/models.py b/subscribers/models.py
@@ -3,7 +3,7 @@
 
 from django.db import models
 
-from djangocon.utils.models import TimeStampedModel
+from utils.models import TimeStampedModel
 
 class Subscriber(TimeStampedModel):
     """

diff --git a/subscribers/urls.py b/subscribers/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('djangocon.subscribers.views',
+urlpatterns = patterns('subscribers.views',
     url(r'^subscribe/$', 'subscribe', name='subscribe'),
     url(r'^unsubscribe/(?P<hash>[0-9a-fA-F]+)/$', 'unsubscribe', name='unsubscribe'),
 )

diff --git a/subscribers/views.py b/subscribers/views.py
@@ -4,8 +4,8 @@
 from django.conf import settings
 from django.http import HttpResponse, HttpResponseBadRequest
 
-from djangocon.subscribers.models import Subscriber
-from djangocon.subscribers.forms import SubscriberForm
+from subscribers.models import Subscriber
+from subscribers.forms import SubscriberForm
 
 
 @require_POST