Remove obsolete Python 2 compatibility code

The changes are mostly related to unicode and conditional imports.

Author: v--

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Nameparser documentation build configuration file, created by
 # sphinx-quickstart on Fri May 16 01:29:58 2014.
@@ -49,8 +48,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Nameparser'
-copyright = u'{:%Y}, Derek Gulbranson'.format(date.today())
+project = 'Nameparser'
+copyright = '{:%Y}, Derek Gulbranson'.format(date.today())
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -223,8 +222,8 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('index', 'Nameparser.tex', u'Nameparser Documentation',
-   u'Derek Gulbranson', 'manual'),
+  ('index', 'Nameparser.tex', 'Nameparser Documentation',
+   'Derek Gulbranson', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -253,8 +252,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'nameparser', u'Nameparser Documentation',
-     [u'Derek Gulbranson'], 1)
+    ('index', 'nameparser', 'Nameparser Documentation',
+     ['Derek Gulbranson'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -267,8 +266,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'Nameparser', u'Nameparser Documentation',
-   u'Derek Gulbranson', 'Nameparser', 'A simple python modules for parsing human names into components.',
+  ('index', 'Nameparser', 'Nameparser Documentation',
+   'Derek Gulbranson', 'Nameparser', 'A simple python modules for parsing human names into components.',
    'Miscellaneous'),
 ]
 

nameparser/config/__init__.py

@@ -125,7 +125,7 @@ def __reduce__(self):
         return (TupleManager, (), self.__getstate__())
 
 
-class Constants(object):
+class Constants:
     """
     An instance of this class hold all of the configuration constants for the parser.
 

nameparser/config/capitalization.py

@@ -7,4 +7,4 @@
 )
 """
 Any pieces that are not capitalized by capitalizing the first letter.
-"""
+"""

nameparser/config/conjunctions.py

@@ -12,4 +12,4 @@
 Pieces that should join to their neighboring pieces, e.g. "and", "y" and "&".
 "of" and "the" are also include to facilitate joining multiple titles,
 e.g. "President of the United States".
-"""
+"""

nameparser/parser.py

@@ -24,7 +24,7 @@ def group_contiguous_integers(data):
     return ranges
 
 
-class HumanName(object):
+class HumanName:
     """
     Parse a person's name into individual components.
 
@@ -352,7 +352,7 @@ def _set_list(self, attr, value):
         else:
             raise TypeError(
                 "Can only assign strings, lists or None to name attributes."
-                " Got {0}".format(type(value)))
+                " Got {}".format(type(value)))
         setattr(self, attr+"_list", self.parse_pieces(val))
 
     @title.setter
@@ -733,7 +733,7 @@ def parse_pieces(self, parts, additional_parts_count=0):
         for part in parts:
             if not isinstance(part, (str, bytes)):
                 raise TypeError("Name parts must be strings. "
-                                "Got {0}".format(type(part)))
+                                " Got {}".format(type(part)))
             output += [x.strip(' ,') for x in part.split(' ')]
 
         # If part contains periods, check if it's multiple titles or suffixes

tests.py

@@ -29,12 +29,6 @@
 
 log = logging.getLogger('HumanName')
 
-try:
-    unittest.expectedFailure
-except AttributeError:
-    # Python 2.6 backport
-    import unittest2 as unittest
-
 
 class HumanNameTestBase(unittest.TestCase):
     def m(self, actual, expected, hn):
@@ -2608,9 +2602,9 @@ def test_variations_of_TEST_NAMES(self):
         log.addHandler(logging.StreamHandler())
         name_string = sys.argv[1]
         hn_instance = HumanName(name_string, encoding=sys.stdout.encoding)
-        print((repr(hn_instance)))
+        print(repr(hn_instance))
         hn_instance.capitalize()
-        print((repr(hn_instance)))
+        print(repr(hn_instance))
         print("Initials: " + hn_instance.initials())
     else:
         print("-"*80)