Mercurial > public > madeira

changeset 90:447d75d1e21d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
For Django 1.5: localflavor is deprecated in preference to a 3rd party app.
author Brian Neal <bgneal@gmail.com>
date Tue, 27 Aug 2013 20:03:32 -0500
parents b7cdfdde3999
children c15b50f1ebfc
files gigs/models.py madeira/settings/base.py requirements.txt
diffstat 3 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gigs/models.py	Tue Aug 27 19:53:31 2013 -0500
+++ b/gigs/models.py	Tue Aug 27 20:03:32 2013 -0500
@@ -3,8 +3,8 @@
 
 """
 from django.db import models
-from django.contrib.localflavor.us.models import USStateField
-from django.contrib.localflavor.us.models import PhoneNumberField
+from localflavor.us.models import USStateField
+from localflavor.us.models import PhoneNumberField
 
 from photologue.models import Photo
 
@@ -43,7 +43,7 @@
     def __unicode__(self):
         if self.state:
             return u'%s, %s' % (self.name, self.state.abbrev)
-        
+
         return self.name
 
 
--- a/madeira/settings/base.py	Tue Aug 27 19:53:31 2013 -0500
+++ b/madeira/settings/base.py	Tue Aug 27 20:03:32 2013 -0500
@@ -100,6 +100,7 @@
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.staticfiles',
+    'localflavor',
     'articles',
     'band',
     'email_list',
--- a/requirements.txt	Tue Aug 27 19:53:31 2013 -0500
+++ b/requirements.txt	Tue Aug 27 20:03:32 2013 -0500
@@ -1,8 +1,11 @@
-Django==1.4.5
+Django==1.5.2
 MySQL-python==1.2.4
 argparse==1.2.1
 python-memcached==1.48
 wsgiref==0.1.2
+django-localflavor==1.0
+docutils==0.8.1
+textile==2.1.5
 #
 # PIL is also hacked into the virtualenv via a symlink to the site-packages version
 #