diff options
author | Seth Morton <seth.m.morton@gmail.com> | 2022-01-28 22:00:28 -0800 |
---|---|---|
committer | Seth Morton <seth.m.morton@gmail.com> | 2022-01-28 22:00:28 -0800 |
commit | da2e32333702dcd18cb33e936a05550bc29fce8c (patch) | |
tree | b6f3a25e9a7ee9e808b0a074ea11632cdc695394 | |
parent | b85dea24e0db30d2652f6ad46fb2a199e15960d2 (diff) | |
parent | 9616d2909899e1a47735c6fcdb6fa84d08c03206 (diff) | |
download | natsort-da2e32333702dcd18cb33e936a05550bc29fce8c.tar.gz |
Merge branch 'master' of github.com:SethMMorton/natsort
-rw-r--r-- | CHANGELOG.md | 10 | ||||
-rw-r--r-- | docs/api.rst | 2 | ||||
-rw-r--r-- | docs/examples.rst | 2 | ||||
-rw-r--r-- | docs/locale_issues.rst | 2 | ||||
-rw-r--r-- | natsort/natsort.py | 4 | ||||
-rw-r--r-- | natsort/unicode_numbers.py | 2 | ||||
-rw-r--r-- | tox.ini | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e1b99a..2f81376 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,7 +52,7 @@ Unreleased ### Changed - MacOS unit tests run on native Python - - Treate `None` like `NaN` internally to avoid `TypeError` (issue #117) + - Treat `None` like `NaN` internally to avoid `TypeError` (issue #117) - No longer fail tests every time a new Python version is released (issue #122) ### Fixed @@ -76,7 +76,7 @@ Unreleased - Release checklist in `RELEASING.md` ([@hugovk](https://github.com/hugovk), issue #106) ### Changed - - Updated auxillary shell scripts to be written in python, and added + - Updated auxiliary shell scripts to be written in python, and added ability to call these from `tox` - Improved Travis-CI experience - Update testing dependency versions @@ -281,7 +281,7 @@ Unreleased because the new factory function paradigm eliminates most `if` branches during execution). For the most cases, the code is 30-40% faster than version 4.0.4. If using `ns.LOCALE` or `humansorted`, the code is 1100% faster than version 4.0.4 - - Improved clarity of documentaion with regards to locale-aware sorting + - Improved clarity of documentation with regards to locale-aware sorting ### Deprecated - `ns.TYPESAFE` option as it is now always on (due to a new @@ -427,7 +427,7 @@ Unreleased - `reverse` option to `natsorted` & co. to make it's API more similar to the builtin 'sorted' - More unit tests - - Auxillary test code that helps in profiling and stress-testing + - Auxiliary test code that helps in profiling and stress-testing - Support for coveralls.io ### Changed @@ -574,7 +574,7 @@ a pipeline by which to filter --- ### Added - - Tests into the natsort.py file iteself + - Tests into the natsort.py file itself ### Changed - Reorganized directory structure diff --git a/docs/api.rst b/docs/api.rst index 39d7cec..242b22d 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -121,7 +121,7 @@ the corresponding regular expression to locate numbers will be returned. Help With Type Hinting ++++++++++++++++++++++ -If you need to explictly specify the types that natsort accepts or returns +If you need to explicitly specify the types that natsort accepts or returns in your code, the following types have been exposed for your convenience. +--------------------------------+----------------------------------------------------------------------------------------+ diff --git a/docs/examples.rst b/docs/examples.rst index a0e3a01..8bc05c0 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -158,7 +158,7 @@ you can easily do this with the ``ns.IGNORECASE`` option: >>> natsorted(a, alg=ns.IGNORECASE) ['Apple', 'apple', 'Banana', 'banana', 'corn', 'Corn'] -Note thats since Python's sorting is stable, the order of equivalent +Note that's since Python's sorting is stable, the order of equivalent elements after lowering the case is the same order they appear in the original list. diff --git a/docs/locale_issues.rst b/docs/locale_issues.rst index f51ab27..56cd5a9 100644 --- a/docs/locale_issues.rst +++ b/docs/locale_issues.rst @@ -23,7 +23,7 @@ Regenerate Key With :func:`~natsort.natsort_keygen` After Changing Locale When :func:`~natsort.natsort_keygen` is called it returns a key function that hard-codes the provided settings. This means that the key returned when -``ns.LOCALE`` is used contains the settings specifed by the locale +``ns.LOCALE`` is used contains the settings specified by the locale *loaded at the time the key is generated*. If you change the locale, you should regenerate the key to account for the new locale. diff --git a/natsort/natsort.py b/natsort/natsort.py index a95f9a9..4abd7fb 100644 --- a/natsort/natsort.py +++ b/natsort/natsort.py @@ -877,7 +877,7 @@ def os_sorted( .. warning:: The resulting function will generate results that will be - differnt depending on your platform. This is intentional. + different depending on your platform. This is intentional. On Windows, this will sort with the same order as Windows Explorer. @@ -893,7 +893,7 @@ def os_sorted( special characters this will give correct results, but once special characters are added you should lower your expectations. - It is *strongly* reccommended to have :mod:`pyicu` installed on + It is *strongly* recommended to have :mod:`pyicu` installed on MacOS/Linux if you want correct sort results. It does *not* take into account if a path is a directory or a file diff --git a/natsort/unicode_numbers.py b/natsort/unicode_numbers.py index 7800fd2..94cf0ff 100644 --- a/natsort/unicode_numbers.py +++ b/natsort/unicode_numbers.py @@ -24,7 +24,7 @@ for a in numeric_hex: # The digit characters are a subset of the numerals. digit_chars = [a for a in numeric_chars if unicodedata.digit(a, None) is not None] -# The decimal characters are a subset of the numberals +# The decimal characters are a subset of the numerals # (probably of the digits, but let's be safe). decimal_chars = [a for a in numeric_chars if unicodedata.decimal(a, None) is not None] @@ -6,7 +6,7 @@ [tox] envlist = flake8, mypy, py36, py37, py38, py39, py310 -# Other valid evironments are: +# Other valid environments are: # docs # release # clean |