nameparser 1.1.2__tar.gz → 1.2.0__tar.gz

{nameparser-1.1.2/nameparser.egg-info → nameparser-1.2.0}/PKG-INFO

@@ -1,32 +1,37 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: nameparser
-Version: 1.1.2
+Version: 1.2.0
 Summary: A simple Python module for parsing human names into their individual components.
-Home-page: https://github.com/derek73/python-nameparser
-Author: Derek Gulbranson
-Author-email: derek73@gmail.com
+Author-email: Derek Gulbranson <derek73@gmail.com>
 License: LGPL
 Keywords: names,parser
 Classifier: Intended Audience :: Developers
-Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
+Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Natural Language :: English
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Text Processing :: Linguistic
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS
+Requires-Dist: typing_extensions>=4.5.0; python_version < "3.11"
+Dynamic: license-file
 
 Name Parser
 ===========
 
 |Build Status| |PyPI| |PyPI version| |Documentation|
 
-A simple Python (3.2+ & 2.6+) module for parsing human names into their
+A simple Python (3.10+) module for parsing human names into their
 individual components. 
 
 * hn.title
@@ -72,7 +77,7 @@ Installation
 If you want to try out the latest code from GitHub you can
 install with pip using the command below.
 
-``pip install -e git+git://github.com/derek73/python-nameparser.git#egg=nameparser``
+``pip install -e git+https://github.com/derek73/python-nameparser.git``
 
 If you need to handle lists of names, check out
 `namesparser <https://github.com/gwu-libraries/namesparser>`_, a

{nameparser-1.1.2 → nameparser-1.2.0}/README.rst

@@ -3,7 +3,7 @@ Name Parser
 
 |Build Status| |PyPI| |PyPI version| |Documentation|
 
-A simple Python (3.2+ & 2.6+) module for parsing human names into their
+A simple Python (3.10+) module for parsing human names into their
 individual components. 
 
 * hn.title
@@ -49,7 +49,7 @@ Installation
 If you want to try out the latest code from GitHub you can
 install with pip using the command below.
 
-``pip install -e git+git://github.com/derek73/python-nameparser.git#egg=nameparser``
+``pip install -e git+https://github.com/derek73/python-nameparser.git``
 
 If you need to handle lists of names, check out
 `namesparser <https://github.com/gwu-libraries/namesparser>`_, a

nameparser-1.2.0/nameparser/__init__.py

@@ -0,0 +1,7 @@
+from nameparser._version import VERSION as VERSION
+from nameparser._version import __version__ as __version__
+from nameparser.parser import HumanName as HumanName
+__author__ = "Derek Gulbranson"
+__author_email__ = 'derek73@gmail.com'
+__license__ = "LGPL"
+__url__ = "https://github.com/derek73/python-nameparser"

nameparser-1.2.0/nameparser/_version.py

@@ -0,0 +1,2 @@
+VERSION = (1, 2, 0)
+__version__ = '.'.join(map(str, VERSION))

{nameparser-1.1.2 → nameparser-1.2.0}/nameparser/config/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 The :py:mod:`nameparser.config` module manages the configuration of the
 nameparser. 
@@ -11,7 +10,7 @@ configuration by importing this instance and changing it.
 
     >>> from nameparser.config import CONSTANTS
     >>> CONSTANTS.titles.remove('hon').add('chemistry','dean') # doctest: +ELLIPSIS
-    SetManager(set([u'msgt', ..., u'adjutant']))
+    SetManager({'msgt', ..., 'adjutant'})
 
 You can also adjust the configuration of individual instances by passing
 ``None`` as the second argument upon instantiation.
@@ -21,22 +20,23 @@ You can also adjust the configuration of individual instances by passing
     >>> from nameparser import HumanName
     >>> hn = HumanName("Dean Robert Johns", None)
     >>> hn.C.titles.add('dean') # doctest: +ELLIPSIS
-    SetManager(set([u'msgt', ..., u'adjutant']))
+    SetManager({'msgt', ..., 'adjutant'})
     >>> hn.parse_full_name() # need to run this again after config changes
 
 **Potential Gotcha**: If you do not pass ``None`` as the second argument,
 ``hn.C`` will be a reference to the module config, possibly yielding 
 unexpected results. See `Customizing the Parser <customize.html>`_.
 """
-from __future__ import unicode_literals
+import re
 import sys
-try:
-    # Python 3.3+
-    from collections.abc import Set
-except ImportError:
-    from collections import Set
+from collections.abc import Iterable, Iterator, Mapping, Set
+from typing import Any, TypeVar
+
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 
-from nameparser.util import binary_type
 from nameparser.util import lc
 from nameparser.config.prefixes import PREFIXES
 from nameparser.config.capitalization import CAPITALIZATION_EXCEPTIONS
@@ -45,7 +45,7 @@ from nameparser.config.suffixes import SUFFIX_ACRONYMS
 from nameparser.config.suffixes import SUFFIX_NOT_ACRONYMS
 from nameparser.config.titles import TITLES
 from nameparser.config.titles import FIRST_NAME_TITLES
-from nameparser.config.regexes import REGEXES
+from nameparser.config.regexes import EMPTY_REGEX, REGEXES
 
 DEFAULT_ENCODING = 'UTF-8'
 
@@ -62,37 +62,25 @@ class SetManager(Set):
 
     '''
 
-    def __init__(self, elements):
+    def __init__(self, elements: Iterable[str]) -> None:
         self.elements = set(elements)
 
-    def __call__(self):
+    def __call__(self) -> Set[str]:
         return self.elements
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return "SetManager({})".format(self.elements)  # used for docs
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[str]:
         return iter(self.elements)
 
-    def __contains__(self, value):
+    def __contains__(self, value: object) -> bool:
         return value in self.elements
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self.elements)
 
-    def next(self):
-        return self.__next__()
-
-    def __next__(self):
-        if self.count >= len(self.elements):
-            self.count = 0
-            raise StopIteration
-        else:
-            c = self.count
-            self.count = c + 1
-            return getattr(self, self.elements[c]) or next(self)
-
-    def add_with_encoding(self, s, encoding=None):
+    def add_with_encoding(self, s: str, encoding: str | None = None) -> None:
         """
         Add the lower case and no-period version of the string to the set. Pass an
         explicit `encoding` parameter to specify the encoding of binary strings that
@@ -102,49 +90,63 @@ class SetManager(Set):
         if sys.stdin:
             stdin_encoding = sys.stdin.encoding
         encoding = encoding or stdin_encoding or DEFAULT_ENCODING
-        if type(s) == binary_type:
+        if isinstance(s, bytes):
             s = s.decode(encoding)
         self.elements.add(lc(s))
 
-    def add(self, *strings):
+    def add(self, *strings: str) -> Self:
         """
         Add the lower case and no-period version of the string arguments to the set.
         Can pass a list of strings. Returns ``self`` for chaining.
         """
-        [self.add_with_encoding(s) for s in strings]
+        for s in strings:
+            self.add_with_encoding(s)
+
         return self
 
-    def remove(self, *strings):
+    def remove(self, *strings: str) -> Self:
         """
         Remove the lower case and no-period version of the string arguments from the set.
         Returns ``self`` for chaining.
         """
-        [self.elements.remove(lc(s)) for s in strings if lc(s) in self.elements]
+        for s in strings:
+            if (lower := lc(s)) in self.elements:
+                self.elements.remove(lower)
+
         return self
 
 
-class TupleManager(dict):
+T = TypeVar('T')
+
+
+class TupleManager(dict[str, T]):
     '''
     A dictionary with dot.notation access. Subclass of ``dict``. Makes the tuple constants 
     more friendly.
     '''
 
-    def __getattr__(self, attr):
+    def __getattr__(self, attr: str) -> T | None:
         return self.get(attr)
+
     __setattr__ = dict.__setitem__
     __delattr__ = dict.__delitem__
 
-    def __getstate__(self):
+    def __getstate__(self) -> Mapping[str, T]:
         return dict(self)
 
-    def __setstate__(self, state):
-        self.__init__(state)
+    def __setstate__(self, state: Mapping[str, T]) -> None:
+        self.update(state)
 
-    def __reduce__(self):
+    def __reduce__(self) -> tuple[type, tuple[()], Mapping[str, T]]:
         return (TupleManager, (), self.__getstate__())
 
 
-class Constants(object):
+class RegexTupleManager(TupleManager[re.Pattern[str]]):
+    def __getattr__(self, attr: str) -> re.Pattern[str]:
+        return self.get(attr, EMPTY_REGEX)
+
+
+class Constants:
     """
     An instance of this class hold all of the configuration constants for the parser.
 
@@ -168,6 +170,17 @@ class Constants(object):
         :py:attr:`regexes`  wrapped with :py:class:`TupleManager`.
     """
 
+    prefixes: SetManager
+    suffix_acronyms: SetManager
+    suffix_not_acronyms: SetManager
+    titles: SetManager
+    first_name_titles: SetManager
+    conjunctions: SetManager
+    capitalization_exceptions: TupleManager[str]
+    regexes: RegexTupleManager
+
+    _pst: Set[str] | None
+
     string_format = "{title} {first} {middle} {last} {suffix} ({nickname})"
     """
     The default string format use for all new `HumanName` instances.
@@ -187,9 +200,9 @@ class Constants(object):
     empty_attribute_default = ''
     """
     Default return value for empty attributes.
-    
+
     .. doctest::
-    
+
         >>> from nameparser.config import CONSTANTS
         >>> CONSTANTS.empty_attribute_default = None
         >>> name = HumanName("John Doe")
@@ -197,7 +210,7 @@ class Constants(object):
         None
         >>>name.first
         'John'
-        
+
     """
 
     capitalize_name = False
@@ -232,15 +245,15 @@ class Constants(object):
     """
 
     def __init__(self,
-                 prefixes=PREFIXES,
-                 suffix_acronyms=SUFFIX_ACRONYMS,
-                 suffix_not_acronyms=SUFFIX_NOT_ACRONYMS,
-                 titles=TITLES,
-                 first_name_titles=FIRST_NAME_TITLES,
-                 conjunctions=CONJUNCTIONS,
-                 capitalization_exceptions=CAPITALIZATION_EXCEPTIONS,
-                 regexes=REGEXES
-                 ):
+                 prefixes: Iterable[str] = PREFIXES,
+                 suffix_acronyms: Iterable[str] = SUFFIX_ACRONYMS,
+                 suffix_not_acronyms: Iterable[str] = SUFFIX_NOT_ACRONYMS,
+                 titles: Iterable[str] = TITLES,
+                 first_name_titles: Iterable[str] = FIRST_NAME_TITLES,
+                 conjunctions: Iterable[str] = CONJUNCTIONS,
+                 capitalization_exceptions: TupleManager[str] | Iterable[tuple[str, str]] = CAPITALIZATION_EXCEPTIONS,
+                 regexes: RegexTupleManager | TupleManager[re.Pattern[str]] | Iterable[tuple[str, re.Pattern[str]]] = REGEXES
+                 ) -> None:
         self.prefixes = SetManager(prefixes)
         self.suffix_acronyms = SetManager(suffix_acronyms)
         self.suffix_not_acronyms = SetManager(suffix_not_acronyms)
@@ -248,22 +261,22 @@ class Constants(object):
         self.first_name_titles = SetManager(first_name_titles)
         self.conjunctions = SetManager(conjunctions)
         self.capitalization_exceptions = TupleManager(capitalization_exceptions)
-        self.regexes = TupleManager(regexes)
+        self.regexes = RegexTupleManager(regexes)
         self._pst = None
 
     @property
-    def suffixes_prefixes_titles(self):
+    def suffixes_prefixes_titles(self) -> Set[str]:
         if not self._pst:
             self._pst = self.prefixes | self.suffix_acronyms | self.suffix_not_acronyms | self.titles
         return self._pst
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return "<Constants() instance>"
 
-    def __setstate__(self, state):
-        self.__init__(state)
+    def __setstate__(self, state: Mapping[str, Any]) -> None:
+        Constants.__init__(self, state)
 
-    def __getstate__(self):
+    def __getstate__(self) -> Mapping[str, Any]:
         attrs = [x for x in dir(self) if not x.startswith('_')]
         return dict([(a, getattr(self, a)) for a in attrs])
 

{nameparser-1.1.2 → nameparser-1.2.0}/nameparser/config/capitalization.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 CAPITALIZATION_EXCEPTIONS = (
     ('ii', 'II'),
     ('iii', 'III'),
@@ -10,4 +7,4 @@ CAPITALIZATION_EXCEPTIONS = (
 )
 """
 Any pieces that are not capitalized by capitalizing the first letter.
-"""
+"""

{nameparser-1.1.2 → nameparser-1.2.0}/nameparser/config/conjunctions.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 CONJUNCTIONS = set([
     '&',
     'and',
@@ -15,4 +12,4 @@ CONJUNCTIONS = set([
 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-1.1.2 → nameparser-1.2.0}/nameparser/config/prefixes.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 #: Name pieces that appear before a last name. Prefixes join to the piece
 #: that follows them to make one new piece. They can be chained together, e.g
 #: "von der" and "de la". Because they only appear in middle or last names,

{nameparser-1.1.2 → nameparser-1.2.0}/nameparser/config/regexes.py

@@ -1,22 +1,13 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 import re
 
 # emoji regex from https://stackoverflow.com/questions/26568722/remove-unicode-emoji-using-re-in-python
-try:
-    # Wide UCS-4 build
-    re_emoji = re.compile('['
-        '\U0001F300-\U0001F64F'
-        '\U0001F680-\U0001F6FF'
-        '\u2600-\u26FF\u2700-\u27BF]+', 
-        re.UNICODE)
-except re.error:
-    # Narrow UCS-2 build
-    re_emoji = re.compile('('
-        '\ud83c[\udf00-\udfff]|'
-        '\ud83d[\udc00-\ude4f\ude80-\udeff]|'
-        '[\u2600-\u26FF\u2700-\u27BF])+', 
-        re.UNICODE)
+re_emoji = re.compile('['  # lgtm[py/overly-large-range]
+    '\U0001F300-\U0001F64F'
+    '\U0001F680-\U0001F6FF'
+    '\u2600-\u26FF\u2700-\u27BF]+',
+    re.UNICODE)
+
+EMPTY_REGEX = re.compile('')
 
 REGEXES = set([
     ("spaces", re.compile(r"\s+", re.U)),

{nameparser-1.1.2 → nameparser-1.2.0}/nameparser/config/suffixes.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 SUFFIX_NOT_ACRONYMS = set([
     'dr',
     'esq',

{nameparser-1.1.2 → nameparser-1.2.0}/nameparser/config/titles.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 FIRST_NAME_TITLES = set([
     'aunt',
     'auntie',