Ensure strings are handled the same in Py2 & 3

Author: tobinus

podgen/__init__.py

@@ -10,6 +10,10 @@
     :copyright: 2016, Thorben Dahl <[email protected]>
     :license: FreeBSD and LGPL, see license.* for more details.
 """
+# Support for Python 2.7
+from __future__ import absolute_import, division, print_function, unicode_literals
+from builtins import *
+
 from .podcast import Podcast
 from .episode import Episode
 from .media import Media

podgen/__main__.py

@@ -7,6 +7,9 @@
         <[email protected]>
     :license: FreeBSD and LGPL, see license.* for more details.
 '''
+# Support for Python 2.7
+from __future__ import absolute_import, division, print_function, unicode_literals
+from builtins import *
 
 import sys
 import datetime

podgen/category.py

@@ -8,6 +8,11 @@
     :copyright: 2016, Thorben Dahl <[email protected]>
     :license: FreeBSD and LGPL, see license.* for more details.
 """
+# Support for Python 2.7
+from __future__ import absolute_import, division, print_function, unicode_literals
+from builtins import *
+
+
 class Category(object):
     """Immutable class representing an iTunes category.
 

podgen/episode.py

@@ -8,6 +8,11 @@
 
     :license: FreeBSD and LGPL, see license.* for more details.
 """
+# Support for Python 2.7
+from __future__ import absolute_import, division, print_function, unicode_literals
+from builtins import *
+from future.utils import iteritems
+
 import warnings
 
 from lxml import etree
@@ -18,8 +23,6 @@
 from podgen.not_supported_by_itunes_warning import NotSupportedByItunesWarning
 from podgen.util import formatRFC2822, listToHumanreadableStr
 from podgen.compat import string_types
-from builtins import str
-from future.utils import iteritems
 
 
 class Episode(object):
@@ -503,14 +506,14 @@ def image(self, image):
     def explicit(self):
         """Whether this podcast episode contains material which may be
         inappropriate for children.
-        
+
         The value of the podcast's explicit attribute is used by default, if
         this is kept as ``None``.
 
         If you set this to ``True``, an "explicit" parental advisory
-        graphic will appear in the Name column in iTunes. If the value is 
-        ``False``, the parental advisory type is considered Clean, meaning that 
-        no explicit language or adult content is included anywhere in this 
+        graphic will appear in the Name column in iTunes. If the value is
+        ``False``, the parental advisory type is considered Clean, meaning that
+        no explicit language or adult content is included anywhere in this
         episode, and a "clean" graphic will appear.
 
         :type: :obj:`bool`

podgen/media.py

@@ -9,11 +9,15 @@
     :copyright: 2016, Thorben Dahl <[email protected]>
     :license: FreeBSD and LGPL, see license.* for more details.
 """
+# Support for Python 2.7
+from __future__ import absolute_import, division, print_function, unicode_literals
+from builtins import *
+from future.moves.urllib.parse import urlparse
+from future.utils import raise_from
+
 import os
 import tempfile
 import warnings
-from future.moves.urllib.parse import urlparse
-from future.utils import raise_from
 import datetime
 
 from tinytag import TinyTag

podgen/not_supported_by_itunes_warning.py

@@ -9,5 +9,10 @@
     :copyright: 2016, Thorben Dahl <[email protected]>
     :license: FreeBSD and LGPL, see license.* for more details.
 """
+# Support for Python 2.7
+from __future__ import absolute_import, division, print_function, unicode_literals
+from builtins import *
+
+
 class NotSupportedByItunesWarning(UserWarning):
     pass

podgen/person.py

@@ -9,6 +9,11 @@
     :copyright: 2016, Thorben Dahl <[email protected]>
     :license: FreeBSD and LGPL, see license.* for more details.
 """
+# Support for Python 2.7
+from __future__ import absolute_import, division, print_function, unicode_literals
+from builtins import *
+
+
 class Person(object):
     """Data-oriented class representing a single person or entity.
 

podgen/podcast.py

@@ -9,7 +9,11 @@
     :license: FreeBSD and LGPL, see license.* for more details.
 
 """
+# Support for Python 2.7
+from __future__ import absolute_import, division, print_function, unicode_literals
+from builtins import *
 from future.utils import iteritems
+
 from lxml import etree
 from datetime import datetime
 import dateutil.parser

podgen/tests/test_category.py

@@ -8,6 +8,10 @@
     :copyright: 2016, Thorben Dahl <[email protected]>
     :license: FreeBSD and LGPL, see license.* for more details.
 """
+# Support for Python 2.7
+from __future__ import absolute_import, division, print_function, unicode_literals
+from builtins import *
+
 import unittest
 
 from podgen import Category

podgen/tests/test_episode.py

@@ -8,6 +8,9 @@
     :copyright: 2016, Thorben Dahl <[email protected]>
     :license: FreeBSD and LGPL, see license.* for more details.
 """
+# Support for Python 2.7
+from __future__ import absolute_import, division, print_function, unicode_literals
+from builtins import *
 
 import unittest
 import warnings
@@ -20,6 +23,7 @@
 import pytz
 from dateutil.parser import parse as parsedate
 
+
 class TestBaseEpisode(unittest.TestCase):
 
     def setUp(self):