Merge pull request jazzband#155 from claudep/python3_syntax

Fixed Python 3 syntax and API issues

newsletter/admin_forms.py

@@ -241,7 +241,7 @@ def parse_vcard(myfile, newsletter, ignore_errors=False):
 
     try:
         myvcards = vobject.readComponents(myfile)
-    except vobject.VObjectError, e:
+    except vobject.VObjectError as e:
         raise forms.ValidationError(
             _(u"Error reading vCard file: %s" % e)
         )
@@ -332,7 +332,7 @@ def handle(self, dn, entry):
     try:
         myparser = AddressParser(myfile)
         myparser.parse()
-    except ValueError, e:
+    except ValueError as e:
         if not ignore_errors:
             raise forms.ValidationError(e)
 

newsletter/admin_utils.py

@@ -8,7 +8,7 @@
 except ImportError:  # Django < 1.7
     from django.contrib.admin.util import unquote
 
-from django.utils.encoding import force_unicode
+from django.utils.encoding import force_text
 
 
 class ExtendibleModelAdminMixin(object):
@@ -29,8 +29,8 @@ def _getobj(self, request, object_id):
                         '%(name)s object with primary key '
                         '%(key)r does not exist.'
                     ) % {
-                        'name': force_unicode(opts.verbose_name),
-                        'key': unicode(object_id)
+                        'name': force_text(opts.verbose_name),
+                        'key': force_text(object_id)
                     }
                 )
 

newsletter/migrations/0001_initial.py

@@ -24,7 +24,7 @@ class Migration(migrations.Migration):
                 ('title', models.CharField(max_length=200, verbose_name='title')),
                 ('text', models.TextField(verbose_name='text')),
                 ('url', models.URLField(null=True, verbose_name='link', blank=True)),
-                ('image', sorl.thumbnail.fields.ImageField(upload_to=b'newsletter/images/%Y/%m/%d', null=True, verbose_name='image', blank=True)),
+                ('image', sorl.thumbnail.fields.ImageField(upload_to='newsletter/images/%Y/%m/%d', null=True, verbose_name='image', blank=True)),
             ],
             options={
                 'ordering': ('sortorder',),
@@ -88,8 +88,8 @@ class Migration(migrations.Migration):
             name='Subscription',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name_field', models.CharField(db_column=b'name', max_length=30, blank=True, help_text='optional', null=True, verbose_name='name')),
-                ('email_field', models.EmailField(db_column=b'email', max_length=75, blank=True, null=True, verbose_name='e-mail', db_index=True)),
+                ('name_field', models.CharField(db_column='name', max_length=30, blank=True, help_text='optional', null=True, verbose_name='name')),
+                ('email_field', models.EmailField(db_column='email', max_length=75, blank=True, null=True, verbose_name='e-mail', db_index=True)),
                 ('ip', models.IPAddressField(null=True, verbose_name='IP address', blank=True)),
                 ('create_date', models.DateTimeField(default=django.utils.timezone.now, editable=False)),
                 ('activation_code', models.CharField(default=newsletter.utils.make_activation_code, max_length=40, verbose_name='activation code')),

newsletter/migrations/0002_auto_20150416_1555.py

@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='subscription',
             name='email_field',
-            field=models.EmailField(db_column=b'email', max_length=254, blank=True, null=True, verbose_name='e-mail', db_index=True),
+            field=models.EmailField(db_column='email', max_length=254, blank=True, null=True, verbose_name='e-mail', db_index=True),
         ),
     ]
 
@@ -31,8 +31,8 @@ class Migration(migrations.Migration):
             migrations.AlterModelManagers(
                 name='newsletter',
                 managers=[
-                    (b'objects', django.db.models.manager.Manager()),
-                    (b'on_site', django.contrib.sites.managers.CurrentSiteManager()),
+                    ('objects', django.db.models.manager.Manager()),
+                    ('on_site', django.contrib.sites.managers.CurrentSiteManager()),
                 ],
             ),
             migrations.AlterField(

newsletter/models.py

@@ -8,6 +8,7 @@
 from django.db.models import permalink
 from django.template import Context
 from django.template.loader import select_template
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
 from django.utils.timezone import now
@@ -31,6 +32,7 @@
 AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
 
 
+@python_2_unicode_compatible
 class Newsletter(models.Model):
     site = models.ManyToManyField(Site, default=get_default_sites)
 
@@ -99,7 +101,7 @@ def get_templates(self, action):
 
         return (subject_template, text_template, html_template)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     class Meta:
@@ -157,6 +159,7 @@ def get_default(cls):
             return None
 
 
+@python_2_unicode_compatible
 class Subscription(models.Model):
     user = models.ForeignKey(
         AUTH_USER_MODEL, blank=True, null=True, verbose_name=_('user')
@@ -323,7 +326,7 @@ def save(self, *args, **kwargs):
         verbose_name=_("unsubscribe date"), null=True, blank=True
     )
 
-    def __unicode__(self):
+    def __str__(self):
         if self.name:
             return _(u"%(name)s <%(email)s> to %(newsletter)s") % {
                 'name': self.name,
@@ -420,6 +423,7 @@ def update_activate_url(self):
         })
 
 
+@python_2_unicode_compatible
 class Article(models.Model):
     """
     An Article within a Message which will be send through a Submission.
@@ -470,7 +474,7 @@ class Meta:
         verbose_name = _('article')
         verbose_name_plural = _('articles')
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     def save(self):
@@ -480,6 +484,7 @@ def save(self):
         super(Article, self).save()
 
 
+@python_2_unicode_compatible
 class Message(models.Model):
     """ Message as sent through a Submission. """
 
@@ -497,7 +502,7 @@ class Message(models.Model):
         verbose_name=_('modified'), auto_now=True, editable=False
     )
 
-    def __unicode__(self):
+    def __str__(self):
         try:
             return _(u"%(title)s in %(newsletter)s") % {
                 'title': self.title,
@@ -529,6 +534,7 @@ def get_default(cls):
             return None
 
 
+@python_2_unicode_compatible
 class Submission(models.Model):
     """
     Submission represents a particular Message as it is being submitted
@@ -539,7 +545,7 @@ class Meta:
         verbose_name = _('submission')
         verbose_name_plural = _('submissions')
 
-    def __unicode__(self):
+    def __str__(self):
         return _(u"%(newsletter)s on %(publish_date)s") % {
             'newsletter': self.message,
             'publish_date': self.publish_date
@@ -602,7 +608,7 @@ def submit(self):
 
                     message.send()
 
-                except Exception, e:
+                except Exception as e:
                     # TODO: Test coverage for this branch.
                     logger.error(
                         ugettext(u'Message %(subscription)s failed '

newsletter/tests/test_mailing.py

@@ -6,6 +6,7 @@
 
 from django.core import mail
 
+from django.utils.six.moves import range
 from django.utils.timezone import now
 
 from ..models import (
@@ -80,7 +81,7 @@ def test_sortorder_defaults(self):
         total = 3
 
         last = 0
-        for current in xrange(total):
+        for current in range(total):
             a = self.make_article()
             if last:
                 self.assert_(a.sortorder > last)
@@ -243,7 +244,7 @@ def test_subscribe_unsubscribe(self):
             self.assertFalse(s.unsubscribe_date)
 
             # Repeat this to ensure consequencentness
-            for x in xrange(2):
+            for x in range(2):
                 s.subscribed = True
                 s.save()
 

newsletter/tests/test_web.py

@@ -20,6 +20,7 @@
 from django.core.urlresolvers import reverse
 
 from django.utils import timezone
+from django.utils.encoding import force_text
 
 from django.test.utils import override_settings, patch_logger
 
@@ -483,7 +484,7 @@ def test_unsubscribe_not_subscribed_view(self):
 
         self.assertIn(
             'You are not subscribed to',
-            unicode(list(response.context['messages'])[0])
+            force_text(list(response.context['messages'])[0])
         )
 
     def test_unsubscribe_post(self):

newsletter/utils.py

@@ -11,6 +11,7 @@
     from django.utils.hashcompat import sha_constructor as sha1
 
 from django.contrib.sites.models import Site
+from django.utils.encoding import force_bytes
 
 from datetime import datetime
 
@@ -34,12 +35,12 @@ def get_user_model():
 def make_activation_code():
     """ Generate a unique activation code. """
     random_string = str(random.random())
-    random_digest = sha1(random_string).hexdigest()[:5]
+    random_digest = sha1(force_bytes(random_string)).hexdigest()[:5]
     time_string = str(datetime.now().microsecond)
 
     combined_string = random_digest + time_string
 
-    return sha1(combined_string).hexdigest()
+    return sha1(force_bytes(combined_string)).hexdigest()
 
 
 def get_default_sites():

newsletter/views.py

@@ -229,7 +229,7 @@ def get_template_names(self):
         else:
             try:
                 return [self.template_name % {'action': self.action}]
-            except KeyError, e:
+            except KeyError as e:
                 raise ImproperlyConfigured(
                     '%(class_name)s inherits from ActionMixin and can contain '
                     '%%(action)s in template_name to be replaced '
@@ -414,7 +414,7 @@ def form_valid(self, form):
         try:
             self.subscription.send_activation_email(action=self.action)
 
-        except (SMTPException, socket.error), e:
+        except (SMTPException, socket.error) as e:
             logger.exception(
                 'Error %s while submitting email to %s.',
                 e, self.subscription.email