A few fixes

feincms · Jan 17, 2014 · 44d365e · 44d365e
1 parent bfef914
commit 44d365e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/feincmsorg/app_library/urls.py b/feincmsorg/app_library/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 from django.views.generic import TemplateView
 
 urlpatterns = patterns('feincmsorg.app_library.views',

diff --git a/feincmsorg/email_usernames/urls.py b/feincmsorg/email_usernames/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('feincmsorg.email_usernames.views',
     url(r'^login/$', 'email_login', name="email-login"), 
@@ -16,4 +16,4 @@
 
 urlpatterns += patterns('',
     url(r'', include('registration.backends.default.urls')),
-)
+)
diff --git a/feincmsorg/templates/base.html b/feincmsorg/templates/base.html
@@ -1,6 +1,7 @@
 <!doctype html> {% load applicationcontent_tags feincms_tags feincms_page_tags %}
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:fb="http://www.facebook.com/2008/fbml" xmlns:og="http://ogp.me/ns#">
 <head>
+<!-- migrated -->
     <meta charset="utf-8" />
     <meta name="keywords" content="{% block meta-keywords %}{{ feincms_page.meta_keywords }} {{ block.super }}{% endblock %}" />
     <meta name="description" content="{% block meta-description %}{% if feincms_page.meta_description %}{{ feincms_page.meta_description }}{% else %}{{ block.super }}{% endif %}{% endblock %}" />

diff --git a/feincmsorg/urls.py b/feincmsorg/urls.py
@@ -1,7 +1,7 @@
 import sys
 
 from django.conf import settings
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 

diff --git a/lib/feincms b/lib/feincms
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,10 @@
-django-registration
+Django==1.4.10
+python-memcached
+django-registration==0.8
 south
 django-social-auth
 feincms==1.5.4
+MySQL-python
+Pillow
+lxml
+BeautifulSoup
diff --git a/runner.wsgi b/runner.wsgi
@@ -3,7 +3,7 @@ import os, sys, site
 
 PATH = os.path.dirname(os.path.abspath(__file__))
 
-site.addsitedir(os.path.join(PATH, 'lib', 'python%s' % sys.version[:3], 'site-packages'))
+site.addsitedir(os.path.join(PATH, 'venv', 'lib', 'python%s' % sys.version[:3], 'site-packages'))
 
 execfile(os.path.join(PATH, 'secrets.py'))