Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trim trailing white space throughout the project #71

Merged
merged 1 commit into from
Nov 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ exclude_lines =
if __name__ == .__main__.:

ignore_errors = True

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ A clear and concise description of what you expected to happen.
- If the bug involves `LOCALE` or `humansorted`:
- Is `PyICU` installed?
- Do you have a locale set? If so, to what?

**To Reproduce**
Include a Minimum, Complete, Verifiable Example. If there is a traceback (or error message), **please** include the *entire* traceback (or error message), even if you think it is too big.

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ Shell script
------------

``natsort`` comes with a shell script called ``natsort``, or can also be called
from the command line with ``python -m natsort``.
from the command line with ``python -m natsort``.

Requirements
------------
Expand Down
1 change: 0 additions & 1 deletion docs/source/bytes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ quickly decode `bytes` to `str` so that sorting is possible.
.. autofunction:: as_ascii

.. autofunction:: as_utf8

1 change: 0 additions & 1 deletion docs/source/chain.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ used internally to :mod:`natsort`, and has been exposed publically for
the convenience of the user.

.. autofunction:: chain_functions

2 changes: 1 addition & 1 deletion docs/source/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ you may need to use the ``ns.PATH`` option:
Locale-Aware Sorting (Human Sorting)
------------------------------------

.. note::
.. note::
Please read :ref:`locale_issues` before using ``ns.LOCALE``, :func:`humansorted`,
or :func:`index_humansorted`.

Expand Down
1 change: 0 additions & 1 deletion docs/source/humansorted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
============================

.. autofunction:: humansorted

1 change: 0 additions & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ Indices and tables
* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`

1 change: 0 additions & 1 deletion docs/source/index_humansorted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
==================================

.. autofunction:: index_humansorted

1 change: 0 additions & 1 deletion docs/source/index_natsorted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
================================

.. autofunction:: index_natsorted

1 change: 0 additions & 1 deletion docs/source/index_realsorted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
=================================

.. autofunction:: index_realsorted

1 change: 0 additions & 1 deletion docs/source/index_versorted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
================================

.. autofunction:: index_versorted

4 changes: 2 additions & 2 deletions docs/source/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ This can be achieved with the :func:`~humansorted` function:

You may find you need to explicitly set the locale to get this to work
(as shown in the example).
Please see :ref:`locale_issues` and the Installation section
Please see :ref:`locale_issues` and the Installation section
below before using the :func:`~humansorted` function.

Further Customizing Natsort
Expand Down Expand Up @@ -314,7 +314,7 @@ Shell script
------------

:mod:`natsort` comes with a shell script called :mod:`natsort`, or can also be called
from the command line with ``python -m natsort``.
from the command line with ``python -m natsort``.

Requirements
------------
Expand Down
2 changes: 1 addition & 1 deletion docs/source/locale_issues.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ If you change locale, the old function will not work as expected.
The `locale <https://docs.python.org/3.5/library/locale.html>`_ library works
with a global state. When :func:`~natsort.natsort_keygen` is called it does the
best job that it can to make the returned function as static as possible and
independent of the global state, but the
independent of the global state, but the
`strxfrm <https://docs.python.org/3.5/library/locale.html#locale.strxfrm>`_
function must access this global state to work; therefore, if you change
locale and use ``ns.LOCALE`` then you should discard the old key.
Expand Down
1 change: 0 additions & 1 deletion docs/source/natsort_key.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
============================

.. autofunction:: natsort_key

1 change: 0 additions & 1 deletion docs/source/natsort_keygen.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
===============================

.. autofunction:: natsort_keygen

1 change: 0 additions & 1 deletion docs/source/natsorted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
==========================

.. autofunction:: natsorted

1 change: 0 additions & 1 deletion docs/source/ns_class.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
====================

.. autoclass:: ns

1 change: 0 additions & 1 deletion docs/source/order_by_index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
===============================

.. autofunction:: order_by_index

1 change: 0 additions & 1 deletion docs/source/realsorted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
===========================

.. autofunction:: realsorted

5 changes: 2 additions & 3 deletions docs/source/shell.rst
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ to bad analysis. To remedy this, use ``natsort``::
$ natsort *.out
mode744.43.out
mode943.54.out
mode1000.35.out
mode1000.35.out
mode1243.34.out
$ natsort -t r *.out | xargs your_program

Expand All @@ -114,7 +114,7 @@ options. These three options are used as follows::
mode1000.35.out mode1243.34.out mode744.43.out mode943.54.out
$ natsort -t r *.out -f 900 1100 # Select only numbers between 900-1100
mode943.54.out
mode1000.35.out
mode1000.35.out
$ natsort -t r *.out -F 900 1100 # Select only numbers NOT between 900-1100
mode744.43.out
mode1243.34.out
Expand Down Expand Up @@ -144,4 +144,3 @@ If you are sorting paths with OS-generated filenames, you may require the
./folder (1)/file.txt
./folder (2)/file.txt
./folder (10)/file.txt

1 change: 0 additions & 1 deletion docs/source/versorted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
==========================

.. autofunction:: versorted

5 changes: 2 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description = Simple yet flexible natural sorting in Python.
long_description = file: README.rst
license = MIT
license_file = LICENSE
classifiers =
classifiers =
Development Status :: 5 - Production/Stable
Intended Audience :: Developers
Intended Audience :: Science/Research
Expand Down Expand Up @@ -55,7 +55,7 @@ max-line-length = 89
import-order-style = pycharm
doctests = True
max-complexity = 10
exclude =
exclude =
natsort.egg-info,
.tox,
.cache,
Expand All @@ -66,4 +66,3 @@ exclude =
docs,
.venv,
natsort/compat/py23.py