Merge 4a0414f into f1a7851

.travis.yml

@@ -2,7 +2,7 @@ language: python
 env:
     PYTHONPATH: .
 python:
-  - "2.7"
+  - "3.6.8"
 install:
   - pip install -r requirements.txt
   - pip install coverage coveralls

README.md

@@ -6,13 +6,14 @@ A port of Rami Ismail's [presskit()/dopresskit](https://github.com/ramiismail/do
 ## Installing
 
 ### Requirements:
-Requirements:
+
 * Django < 2
 * django-filer
 * easy_thumbnails
 * Markdown
 * Pillow
 * django-admin-sortable2
+* future
 
 ## Configuring
 

django_presskit/models.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from builtins import object
 from django.db import models
 from filer.fields.file import FilerFileField
 from filer.fields.image import FilerImageField
@@ -18,13 +19,13 @@ class AdditionalLink(models.Model):
     class Meta(object):
         ordering = ['my_order', 'datetime_updated']
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title + ' ' + self.website
 
 class Attachment(models.Model):
     content = FilerImageField()
 
-    def __unicode__(self):
+    def __str__(self):
         return self.content.url
 
 class Award(models.Model):
@@ -37,7 +38,7 @@ class Award(models.Model):
     class Meta(object):
         ordering = ['my_order', 'datetime_updated']
 
-    def __unicode__(self):
+    def __str__(self):
         return self.description
 
 
@@ -75,14 +76,14 @@ class Company(models.Model):
     datetime_updated = models.DateTimeField(auto_now=True)
     asset_archive = FilerFileField(blank=True,null=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     def get_absolute_url(self):
         from django.urls import reverse
         return reverse('django_presskit:company', kwargs={'company_slug': self.slug})
 
-    class Meta:
+    class Meta(object):
         verbose_name_plural = 'companies'
 
 
@@ -135,7 +136,7 @@ class Contact(models.Model):
     class Meta(object):
         ordering = ['my_order', 'datetime_updated']
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 
@@ -150,7 +151,7 @@ class Credit(models.Model):
     class Meta(object):
         ordering = ['my_order', 'datetime_updated']
 
-    def __unicode__(self):
+    def __str__(self):
         return self.person + ', ' + self.role
 
 
@@ -164,7 +165,7 @@ class Feature(models.Model):
     class Meta(object):
         ordering = ['my_order', 'datetime_updated']
 
-    def __unicode__(self):
+    def __str__(self):
         return self.description
 
 
@@ -174,7 +175,7 @@ class MonetizationPermission(models.Model):
     datetime_created = models.DateTimeField(auto_now_add=True)
     datetime_updated = models.DateTimeField(auto_now=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.option
 
 
@@ -189,7 +190,7 @@ class Platform(models.Model):
     class Meta(object):
         ordering = ['my_order', 'datetime_updated']
 
-    def __unicode__(self):
+    def __str__(self):
         return self.project.title + ' - ' + self.name
 
 
@@ -203,7 +204,7 @@ class Price(models.Model):
     class Meta(object):
         ordering = ['my_order', 'datetime_updated']
 
-    def __unicode__(self):
+    def __str__(self):
         return self.project.title + ' - ' + self.price
 
 
@@ -249,7 +250,7 @@ def get_absolute_url(self):
         from django.urls import reverse
         return reverse('django_presskit:project', kwargs={'project_slug': self.slug})
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
 
@@ -289,7 +290,7 @@ class Quote(models.Model):
     class Meta(object):
         ordering = ['my_order', 'datetime_updated']
 
-    def __unicode__(self):
+    def __str__(self):
         return self.reviewer + ', ' + self.website + ', ' + self.description
 
 
@@ -304,7 +305,7 @@ class Social(models.Model):
     class Meta(object):
         ordering = ['my_order', 'datetime_updated']
 
-    def __unicode__(self):
+    def __str__(self):
         return self.company.title + ' ' + self.name
 
 

django_presskit/templatetags/dpk_util.py

@@ -1,6 +1,8 @@
+from future import standard_library
+standard_library.install_aliases()
 import markdown
 import re
-from urlparse import urlparse
+from urllib.parse import urlparse
 from django import template
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe

requirements.txt

@@ -3,4 +3,5 @@ django-filer==1.4.0
 easy_thumbnails==2.5
 Markdown==2.6.11
 Pillow==4.3.0
+future==0.18.2
 django-admin-sortable2==0.7

setup.py

@@ -15,7 +15,7 @@
     packages=setuptools.find_packages(),
     include_package_data=True,
     classifiers=[
-        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.7",
         "Framework :: Django :: 1.11",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: OS Independent",

tests/test_models.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from builtins import str
 from django.test import TestCase
 
 from django_presskit.models import Company, Project, AdditionalLink,\
@@ -12,14 +13,14 @@ class AdditionalLinkModelTests(TestCase):
 
     def test_unicode(self):
         link = AdditionalLink(title='Test Link', website='https://test.com')
-        self.assertEqual(unicode(link), 'Test Link https://test.com')
+        self.assertEqual(str(link), 'Test Link https://test.com')
 
 
 class AwardModelTests(TestCase):
 
     def test_unicode(self):
         award = Award(description='Test Award')
-        self.assertEqual(unicode(award), 'Test Award')
+        self.assertEqual(str(award), 'Test Award')
 
 
 class CompanyModelTests(TestCase):
@@ -30,51 +31,51 @@ def test_company_url(self):
 
     def test_unicode(self):
         comp = Company(title='Test Company', slug='test-company')
-        self.assertEqual(unicode(comp), 'Test Company')
+        self.assertEqual(str(comp), 'Test Company')
 
 
 class ContactModelTests(TestCase):
 
     def test_unicode(self):
         contact = Contact(name='Test Contact')
-        self.assertEqual(unicode(contact), 'Test Contact')
+        self.assertEqual(str(contact), 'Test Contact')
 
 
 class CreditModelTests(TestCase):
 
     def test_unicode(self):
         credit = Credit(person='Test Person', role='Test Role')
-        self.assertEqual(unicode(credit), 'Test Person, Test Role')
+        self.assertEqual(str(credit), 'Test Person, Test Role')
 
 
 class FeatureModelTests(TestCase):
 
     def test_unicode(self):
         feature = Feature(description='Test Feature')
-        self.assertEqual(unicode(feature), 'Test Feature')
+        self.assertEqual(str(feature), 'Test Feature')
 
 
 class MonetizationPermissionModelTests(TestCase):
 
     def test_unicode(self):
         perms = MonetizationPermission(option='Test Permission')
-        self.assertEqual(unicode(perms), 'Test Permission')
+        self.assertEqual(str(perms), 'Test Permission')
 
 
 class PlatformModelTests(TestCase):
 
     def test_unicode(self):
         project = Project(title='Test Project')
         plat = Platform(project=project, name='Test Platform')
-        self.assertEqual(unicode(plat), 'Test Project - Test Platform')
+        self.assertEqual(str(plat), 'Test Project - Test Platform')
 
 
 class PriceModelTests(TestCase):
 
     def test_unicode(self):
         project = Project(title='Test Project')
         price = Price(project=project, price='Test Price')
-        self.assertEqual(unicode(price), 'Test Project - Test Price')
+        self.assertEqual(str(price), 'Test Project - Test Price')
 
 
 class ProjectModelTests(TestCase):
@@ -86,20 +87,20 @@ def test_project_url(self):
 
     def test_unicode(self):
         proj = Project(title='Test Project')
-        self.assertEqual(unicode(proj), 'Test Project')
+        self.assertEqual(str(proj), 'Test Project')
 
 
 class QuoteModelTests(TestCase):
 
     def test_unicode(self):
         quote = Quote(reviewer='Test Person', description='Test Description',
                       website='https://test.com')
-        self.assertEqual(unicode(quote), 'Test Person, https://test.com, Test Description')
+        self.assertEqual(str(quote), 'Test Person, https://test.com, Test Description')
 
 
 class SocialModelTests(TestCase):
 
     def test_unicode(self):
         comp = Company(title='Test Company', slug='test-company')
         social = Social(company=comp, name='Test Social')
-        self.assertEqual(unicode(social), 'Test Company Test Social')
+        self.assertEqual(str(social), 'Test Company Test Social')