Update for django 1.4

24 files changed, 15 insertions, 19 deletions

diff --git a/manage.py b/manage.py
index 1473748..51881cf 100755
--- a/manage.py
+++ b/manage.py
@@ -1,14 +1,9 @@
 #!/usr/bin/env python2
-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.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
-    sys.exit(1)
-
-import settings
+import os, sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ryuslash.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/requirements.txt b/requirements.txt
index a7f9cbf..fe887e2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django==1.3
+Django==1.4
 South==0.7.4
 Feedparser==5.1.1
 Markdown==2.1.1
diff --git a/aggregator/__init__.py b/ryuslash/__init__.py
index e69de29..e69de29 100644
--- a/aggregator/__init__.py
+++ b/ryuslash/__init__.py
diff --git a/aggregator/README.org b/ryuslash/aggregator/README.org
index 1bca9e7..1bca9e7 100644
--- a/aggregator/README.org
+++ b/ryuslash/aggregator/README.org
diff --git a/aggregator/management/__init__.py b/ryuslash/aggregator/__init__.py
index e69de29..e69de29 100644
--- a/aggregator/management/__init__.py
+++ b/ryuslash/aggregator/__init__.py
diff --git a/aggregator/feeds.py b/ryuslash/aggregator/feeds.py
index 75e5d4f..75e5d4f 100644
--- a/aggregator/feeds.py
+++ b/ryuslash/aggregator/feeds.py
diff --git a/aggregator/management/commands/__init__.py b/ryuslash/aggregator/management/__init__.py
index e69de29..e69de29 100644
--- a/aggregator/management/commands/__init__.py
+++ b/ryuslash/aggregator/management/__init__.py
diff --git a/aggregator/migrations/__init__.py b/ryuslash/aggregator/management/commands/__init__.py
index e69de29..e69de29 100644
--- a/aggregator/migrations/__init__.py
+++ b/ryuslash/aggregator/management/commands/__init__.py
diff --git a/aggregator/management/commands/loadfeeds.py b/ryuslash/aggregator/management/commands/loadfeeds.py
index f826312..f826312 100644
--- a/aggregator/management/commands/loadfeeds.py
+++ b/ryuslash/aggregator/management/commands/loadfeeds.py
diff --git a/aggregator/migrations/0001_initial.py b/ryuslash/aggregator/migrations/0001_initial.py
index 550a389..550a389 100644
--- a/aggregator/migrations/0001_initial.py
+++ b/ryuslash/aggregator/migrations/0001_initial.py
diff --git a/aggregator/templatetags/__init__.py b/ryuslash/aggregator/migrations/__init__.py
index e69de29..e69de29 100644
--- a/aggregator/templatetags/__init__.py
+++ b/ryuslash/aggregator/migrations/__init__.py
diff --git a/aggregator/models.py b/ryuslash/aggregator/models.py
index 34fb5a3..34fb5a3 100644
--- a/aggregator/models.py
+++ b/ryuslash/aggregator/models.py
diff --git a/aggregator/templates/aggregator/base.html b/ryuslash/aggregator/templates/aggregator/base.html
index 215ec7e..215ec7e 100644
--- a/aggregator/templates/aggregator/base.html
+++ b/ryuslash/aggregator/templates/aggregator/base.html
diff --git a/aggregator/templates/aggregator/posts.html b/ryuslash/aggregator/templates/aggregator/posts.html
index b70cb0d..b70cb0d 100644
--- a/aggregator/templates/aggregator/posts.html
+++ b/ryuslash/aggregator/templates/aggregator/posts.html
diff --git a/ryuslash/aggregator/templatetags/__init__.py b/ryuslash/aggregator/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ryuslash/aggregator/templatetags/__init__.py
diff --git a/aggregator/templatetags/posts_extras.py b/ryuslash/aggregator/templatetags/posts_extras.py
index 64718a2..64718a2 100644
--- a/aggregator/templatetags/posts_extras.py
+++ b/ryuslash/aggregator/templatetags/posts_extras.py
diff --git a/aggregator/views.py b/ryuslash/aggregator/views.py
index bb3c1b7..bb3c1b7 100644
--- a/aggregator/views.py
+++ b/ryuslash/aggregator/views.py
diff --git a/local_settings.py.example b/ryuslash/local_settings.py.example
index 9247eba..9247eba 100644
--- a/local_settings.py.example
+++ b/ryuslash/local_settings.py.example
diff --git a/settings.py b/ryuslash/settings.py
index 75de1a9..c5eecee 100644
--- a/settings.py
+++ b/ryuslash/settings.py
@@ -36,11 +36,6 @@ STATIC_ROOT = ''
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/static/'
 
-# URL prefix for admin static files -- CSS, JavaScript and images.
-# Make sure to use a trailing slash.
-# Examples: "http://foo.com/static/admin/", "/static/admin/".
-ADMIN_MEDIA_PREFIX = '/static/admin/'
-
 # Additional locations of static files
 STATICFILES_DIRS = [ '%s/static' % DEPLOY_PATH ]
 
@@ -67,7 +62,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-ROOT_URLCONF = 'ryuslash_org.urls'
+ROOT_URLCONF = 'ryuslash.urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -89,9 +84,15 @@ INSTALLED_APPS = ('django.contrib.contenttypes',
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
+    'filters': {
+        'require_debug_false': {
+            '()': 'django.utils.log.RequireDebugFalse'
+        }
+    },
     'handlers': {
         'mail_admins': {
             'level': 'ERROR',
+            'filters': ['require_debug_false'],
             'class': 'django.utils.log.AdminEmailHandler'
         }
     },
diff --git a/static/favicon.png b/ryuslash/static/favicon.png
index 66fc2e4..66fc2e4 100644
--- a/static/favicon.png
+++ b/ryuslash/static/favicon.png
diff --git a/static/images/logos/.gitignore b/ryuslash/static/images/logos/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/static/images/logos/.gitignore
+++ b/ryuslash/static/images/logos/.gitignore
diff --git a/static/logo.png b/ryuslash/static/logo.png
index a451578..a451578 100644
--- a/static/logo.png
+++ b/ryuslash/static/logo.png
diff --git a/static/main.css b/ryuslash/static/main.css
index 4c8a460..4c8a460 100644
--- a/static/main.css
+++ b/ryuslash/static/main.css
diff --git a/urls.py b/ryuslash/urls.py
index d23c303..917f2e9 100644
--- a/urls.py
+++ b/ryuslash/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
 from aggregator.feeds import LatestPostsFeed