Drop support for EOL Python 2

.pre-commit-config.yaml

@@ -1,8 +1,15 @@
 repos:
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v1.26.2
+    hooks:
+      - id: pyupgrade
+        args: ["--py3-plus"]
+
   - repo: https://github.com/psf/black
     rev: 19.10b0
     hooks:
       - id: black
+        args: ["--target-version", "py35"]
 
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.7.9
@@ -29,4 +36,5 @@ repos:
     rev: v2.5.0
     hooks:
       - id: check-merge-conflict
+      - id: check-toml
       - id: check-yaml

.travis.yml

@@ -2,14 +2,12 @@ language: python
 cache: pip
 
 python:
- - 2.7
+ - pypy3
  - 3.5
  - 3.6
  - 3.7
  - 3.8
  - 3.9-dev
- - pypy
- - pypy3
 
 install:
   - pip install -U pip

README.md

@@ -9,10 +9,10 @@
 [![MIT License](https://img.shields.io/github/license/jmoiron/humanize.svg)](LICENSE)
 
 This modest package contains various common humanization utilities, like turning
-a number into a fuzzy human readable duration ('3 minutes ago') or into a human
-readable size or throughput.  It works with Python 2.7 and 3.5+ and is localized
-to:
+a number into a fuzzy human readable duration ("3 minutes ago") or into a human
+readable size or throughput. It is localized to:
 
+* Brazilian Portuguese
 * Dutch
 * Finnish
 * French
@@ -22,7 +22,6 @@ to:
 * Japanese
 * Korean
 * Persian
-* Portuguese Brazilian
 * Russian
 * Simplified Chinese
 * Slovak
@@ -50,26 +49,28 @@ Integer humanization:
 Date & time humanization:
 
 ```pycon
->>> import datetime
->>> humanize.naturalday(datetime.datetime.now())
+>>> import humanize
+>>> import datetime as dt
+>>> humanize.naturalday(dt.datetime.now())
 'today'
->>> humanize.naturaldelta(datetime.timedelta(seconds=1001))
+>>> humanize.naturaldelta(dt.timedelta(seconds=1001))
 '16 minutes'
->>> humanize.naturalday(datetime.datetime.now() - datetime.timedelta(days=1))
+>>> humanize.naturalday(dt.datetime.now() - dt.timedelta(days=1))
 'yesterday'
->>> humanize.naturalday(datetime.date(2007, 6, 5))
+>>> humanize.naturalday(dt.date(2007, 6, 5))
 'Jun 05'
->>> humanize.naturaldate(datetime.date(2007, 6, 5))
+>>> humanize.naturaldate(dt.date(2007, 6, 5))
 'Jun 05 2007'
->>> humanize.naturaltime(datetime.datetime.now() - datetime.timedelta(seconds=1))
+>>> humanize.naturaltime(dt.datetime.now() - dt.timedelta(seconds=1))
 'a second ago'
->>> humanize.naturaltime(datetime.datetime.now() - datetime.timedelta(seconds=3600))
+>>> humanize.naturaltime(dt.datetime.now() - dt.timedelta(seconds=3600))
 'an hour ago'
 ```
 
 File size humanization:
 
 ```pycon
+>>> import humanize
 >>> humanize.naturalsize(1000000)
 '1.0 MB'
 >>> humanize.naturalsize(1000000, binary=True)
@@ -81,6 +82,7 @@ File size humanization:
 Human readable floating point numbers:
 
 ```pycon
+>>> import humanize
 >>> humanize.fractional(1/3)
 '1/3'
 >>> humanize.fractional(1.5)
@@ -98,20 +100,23 @@ Human readable floating point numbers:
 How to change locale at runtime:
 
 ```pycon
->>> print(humanize.naturaltime(datetime.timedelta(seconds=3)))
+>>> import humanize
+>>> import datetime as dt
+>>> humanize.naturaltime(dt.timedelta(seconds=3))
 3 seconds ago
->>> _t = humanize.i18n.activate('ru_RU')
->>> print(humanize.naturaltime(datetime.timedelta(seconds=3)))
+>>> _t = humanize.i18n.activate("ru_RU")
+>>> humanize.naturaltime(dt.timedelta(seconds=3))
 3 секунды назад
 >>> humanize.i18n.deactivate()
->>> print(humanize.naturaltime(datetime.timedelta(seconds=3)))
+>>> humanize.naturaltime(dt.timedelta(seconds=3))
 3 seconds ago
 ```
 
 You can pass additional parameter `path` to `activate` to specify a path to search
 locales in.
 
 ```pycon
+>>> import humanize
 >>> humanize.i18n.activate("pt_BR")
 IOError: [Errno 2] No translation file found for domain: 'humanize'
 >>> humanize.i18n.activate("pt_BR", path="path/to/my/portuguese/translation/")

pyproject.toml

@@ -0,0 +1,2 @@
+[tool.black]
+target_version = ["py35"]

setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
 [flake8]
 max_line_length = 88
 

setup.py

@@ -1,8 +1,6 @@
-import io
-
 from setuptools import find_packages, setup
 
-with io.open("README.md", encoding="UTF-8") as f:
+with open("README.md", encoding="UTF-8") as f:
     long_description = f.read()
 
 
@@ -29,25 +27,21 @@ def local_scheme(version):
     zip_safe=False,
     use_scm_version={"local_scheme": local_scheme},
     setup_requires=["setuptools_scm"],
-    extras_require={
-        "tests": ["freezegun", "pytest", "pytest-cov"],
-        "tests:python_version < '3.4'": ["mock"],
-    },
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
+    extras_require={"tests": ["freezegun", "pytest", "pytest-cov"]},
+    python_requires=">=3.5",
     # Get strings from https://pypi.org/pypi?%3Aaction=list_classifiers
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Text Processing",

src/humanize/filesize.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 """Bits & Bytes related humanization."""
 

src/humanize/i18n.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import gettext as gettext_module
 import os.path
 from threading import local
@@ -20,7 +19,8 @@ def get_translation():
 
 def activate(locale, path=None):
     """Set 'locale' as current locale. Search for locale in directory 'path'
-    @param locale: language name, eg 'en_GB'"""
+    @param locale: language name, eg 'en_GB'
+    @param path: path to search for locales"""
     if path is None:
         path = _DEFAULT_LOCALE_PATH
     if locale not in _TRANSLATIONS:
@@ -42,11 +42,16 @@ def pgettext(msgctxt, message):
     """'Particular gettext' function.
     It works with 'msgctxt' .po modifiers and allow duplicate keys with
     different translations.
-    Python 2 don't have support for this GNU gettext function, so we
+    This GNU gettext function was added in Python 3.8, so for older versions we
     reimplement it. It works by joining msgctx and msgid by '4' byte."""
-    key = msgctxt + "\x04" + message
-    translation = get_translation().gettext(key)
-    return message if translation == key else translation
+    try:
+        # Python 3.8+
+        return get_translation().pgettext(msgctxt, message)
+    except AttributeError:
+        # Python 3.7 and older
+        key = msgctxt + "\x04" + message
+        translation = get_translation().gettext(key)
+        return message if translation == key else translation
 
 
 def ngettext(message, plural, num):

src/humanize/number.py

@@ -1,12 +1,10 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 """Humanizing functions for numbers."""
 
 import re
 from fractions import Fraction
 
-from . import compat
 from .i18n import gettext as _
 from .i18n import gettext_noop as N_
 from .i18n import pgettext as P_
@@ -43,7 +41,7 @@ def intcomma(value):
     some compatibility with Django's intcomma, this function also accepts
     floats."""
     try:
-        if isinstance(value, compat.string_types):
+        if isinstance(value, str):
             float(value.replace(",", ""))
         else:
             float(value)
@@ -138,15 +136,15 @@ def fractional(value):
         number = float(value)
     except (TypeError, ValueError):
         return value
-    wholeNumber = int(number)
-    frac = Fraction(number - wholeNumber).limit_denominator(1000)
+    whole_number = int(number)
+    frac = Fraction(number - whole_number).limit_denominator(1000)
     numerator = frac._numerator
     denominator = frac._denominator
-    if wholeNumber and not numerator and denominator == 1:
+    if whole_number and not numerator and denominator == 1:
         # this means that an integer was passed in
         # (or variants of that integer like 1.0000)
-        return "%.0f" % wholeNumber
-    elif not wholeNumber:
-        return "%.0f/%.0f" % (numerator, denominator)
+        return "%.0f" % whole_number
+    elif not whole_number:
+        return "{:.0f}/{:.0f}".format(numerator, denominator)
     else:
-        return "%.0f %.0f/%.0f" % (wholeNumber, numerator, denominator)
+        return "{:.0f} {:.0f}/{:.0f}".format(whole_number, numerator, denominator)

src/humanize/time.py

@@ -1,10 +1,9 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 """Time humanizing functions.  These are largely borrowed from Django's
 ``contrib.humanize``."""
 
-from datetime import date, datetime, timedelta
+import datetime as dt
 
 from .i18n import gettext as _
 from .i18n import ngettext
@@ -13,7 +12,7 @@
 
 
 def _now():
-    return datetime.now()
+    return dt.datetime.now()
 
 
 def abs_timedelta(delta):
@@ -29,19 +28,19 @@ def date_and_delta(value):
     """Turn a value into a date and a timedelta which represents how long ago
     it was.  If that's not possible, return (None, value)."""
     now = _now()
-    if isinstance(value, datetime):
+    if isinstance(value, dt.datetime):
         date = value
         delta = now - value
-    elif isinstance(value, timedelta):
+    elif isinstance(value, dt.timedelta):
         date = now - value
         delta = value
     else:
         try:
             value = int(value)
-            delta = timedelta(seconds=value)
+            delta = dt.timedelta(seconds=value)
             date = now - delta
         except (ValueError, TypeError):
-            return (None, value)
+            return None, value
     return date, abs_timedelta(delta)
 
 
@@ -122,7 +121,7 @@ def naturaltime(value, future=False, months=True):
     if date is None:
         return value
     # determine tense by value only if datetime/timedelta were passed
-    if isinstance(value, (datetime, timedelta)):
+    if isinstance(value, (dt.datetime, dt.timedelta)):
         future = date > now
 
     ago = _("%s from now") if future else _("%s ago")
@@ -139,14 +138,14 @@ def naturalday(value, format="%b %d"):
     present day returns representing string. Otherwise, returns a string
     formatted according to ``format``."""
     try:
-        value = date(value.year, value.month, value.day)
+        value = dt.date(value.year, value.month, value.day)
     except AttributeError:
         # Passed value wasn't date-ish
         return value
     except (OverflowError, ValueError):
         # Date arguments out of range
         return value
-    delta = value - date.today()
+    delta = value - dt.date.today()
     if delta.days == 0:
         return _("today")
     elif delta.days == 1:
@@ -160,14 +159,14 @@ def naturaldate(value):
     """Like naturalday, but will append a year for dates that are a year
     ago or more."""
     try:
-        value = date(value.year, value.month, value.day)
+        value = dt.date(value.year, value.month, value.day)
     except AttributeError:
         # Passed value wasn't date-ish
         return value
     except (OverflowError, ValueError):
         # Date arguments out of range
         return value
-    delta = abs_timedelta(value - date.today())
+    delta = abs_timedelta(value - dt.date.today())
     if delta.days >= 365:
         return naturalday(value, "%b %d %Y")
     return naturalday(value)

tests/base.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 """Tests base classes."""
 

tests/test_filesize.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 """Tests for filesize humanizing."""
 

tests/test_i18n.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import datetime as dt
 
 import humanize
@@ -8,9 +7,13 @@ def test_i18n():
     three_seconds = dt.timedelta(seconds=3)
 
     assert humanize.naturaltime(three_seconds) == "3 seconds ago"
+    assert humanize.ordinal(5) == "5th"
 
-    humanize.i18n.activate("ru_RU")
-    assert humanize.naturaltime(three_seconds) == "3 секунды назад"
-
-    humanize.i18n.deactivate()
-    assert humanize.naturaltime(three_seconds) == "3 seconds ago"
+    try:
+        humanize.i18n.activate("ru_RU")
+        assert humanize.naturaltime(three_seconds) == "3 секунды назад"
+        assert humanize.ordinal(5) == "5ый"
+    finally:
+        humanize.i18n.deactivate()
+        assert humanize.naturaltime(three_seconds) == "3 seconds ago"
+        assert humanize.ordinal(5) == "5th"