diff --git a/CHANGELOG.md b/CHANGELOG.md index 2331019..3bad46c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -540,7 +540,7 @@ to community contributions and encouragement. * Corrected cases where OMD was not exactly a dropin for OrderedDict * conditional availability of [gcutils.get_all][gcutils.get_all] based on pypy or cpython, also [gcutils.is_tracked][gcutils.is_tracked] was added in 2.7, so making [gcutils.get_all][gcutils.get_all] work with 2.6 - * Made namedutils backwards compatibilty for python 2.6 best effort + * Made namedutils backwards compatibility for python 2.6 best effort * Fix invalid part_path usage in [fileutils.AtomicSaver][fileutils.AtomicSaver] 0.5.0 @@ -680,7 +680,7 @@ added in this release. * fix a bug in [dictutils.OrderedMultiDict][dictutils.OrderedMultiDict]'s .add() * adding initial reimplementation of OMD * adding some tests to dictutils - * update boltons formatutils to match what's goin on in lithoxyl + * update boltons formatutils to match what's going on in lithoxyl * remove infer_pos_args() from strutils (already in formatutils) * add formatutils to boltons * fix a potential infinite recursion in LocalTZ diff --git a/boltons/debugutils.py b/boltons/debugutils.py index 03f3c6c..98c89f0 100644 --- a/boltons/debugutils.py +++ b/boltons/debugutils.py @@ -128,7 +128,7 @@ def wrap_trace(obj, hook=trace_print_hook, hook (callable): A function called once for every event. See below for details. which (str): One or more attribute names to trace, or a - function accepting attribute name and value, and returing + function accepting attribute name and value, and returning True/False. events (str): One or more kinds of events to call *hook* on. Expected values are ``['get', 'set', 'del', 'call', diff --git a/boltons/formatutils.py b/boltons/formatutils.py index dad6b65..d1ac66c 100644 --- a/boltons/formatutils.py +++ b/boltons/formatutils.py @@ -74,7 +74,7 @@ def construct_format_field_str(fname, fspec, conv): def split_format_str(fstr): - """Does very basic spliting of a format string, returns a list of + """Does very basic splitting of a format string, returns a list of strings. For full tokenization, see :func:`tokenize_format_str`. """ @@ -172,7 +172,7 @@ def get_format_args(fstr): def tokenize_format_str(fstr, resolve_pos=True): """Takes a format string, turns it into a list of alternating string literals and :class:`BaseFormatField` tokens. By default, also - infers anonymous positional references into explict, numbered + infers anonymous positional references into explicit, numbered positional references. To disable this behavior set *resolve_pos* to ``False``. """ diff --git a/boltons/iterutils.py b/boltons/iterutils.py index 317be09..8f93cb2 100644 --- a/boltons/iterutils.py +++ b/boltons/iterutils.py @@ -1139,7 +1139,7 @@ class SequentialGUIDerator(GUIDerator): value and increments every iteration. This yields GUIDs which are of course unique, but also ordered and lexicographically sortable. - The SequentialGUIDerator is aronud 50% faster than the normal + The SequentialGUIDerator is around 50% faster than the normal GUIDerator, making it almost 20x as fast as the built-in uuid module. By default it is also more compact, partly due to its 96-bit (24-hexdigit) default length. 96 bits of randomness means that diff --git a/boltons/queueutils.py b/boltons/queueutils.py index 08eac34..59d478a 100644 --- a/boltons/queueutils.py +++ b/boltons/queueutils.py @@ -13,7 +13,7 @@ cooperative/single-threaded use cases. The ``queueutils`` module currently provides two Queue implementations: :class:`HeapPriorityQueue`, based on a heap, and :class:`SortedPriorityQueue`, based on a sorted list. Both use a -unified API based on :class:`BasePriortyQueue` to facilitate testing +unified API based on :class:`BasePriorityQueue` to facilitate testing the slightly different performance characteristics on various application use cases. diff --git a/boltons/strutils.py b/boltons/strutils.py index 9fe7340..52f613d 100644 --- a/boltons/strutils.py +++ b/boltons/strutils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """So much practical programming involves string manipulation, which -Python readily accomodates. Still, there are dozens of basic and +Python readily accommodates. Still, there are dozens of basic and common capabilities missing from the standard library, several of them provided by ``strutils``. """ diff --git a/boltons/tbutils.py b/boltons/tbutils.py index 75979da..f5dad9c 100644 --- a/boltons/tbutils.py +++ b/boltons/tbutils.py @@ -35,7 +35,7 @@ except NameError: # TODO: chaining primitives? what are real use cases where these help? -# TODO: print_* for backwards compatability +# TODO: print_* for backwards compatibility # __all__ = ['extract_stack', 'extract_tb', 'format_exception', # 'format_exception_only', 'format_list', 'format_stack', # 'format_tb', 'print_exc', 'format_exc', 'print_exception', diff --git a/tests/test_ioutils.py b/tests/test_ioutils.py index 772687b..b14dd66 100644 --- a/tests/test_ioutils.py +++ b/tests/test_ioutils.py @@ -315,7 +315,7 @@ class TestSpooledStringIO(TestCase, BaseTestMixin, AssertionsMixin): self.assertEqual(self.spooled_flo.len, len(self.test_str)) def test_len_rollover(self): - """Make sure len propery works with on-disk flo""" + """Make sure len property works with on-disk flo""" self.spooled_flo.write(self.test_str) self.spooled_flo.rollover() self.assertEqual(self.spooled_flo.len, len(self.test_str)) diff --git a/tests/test_iterutils.py b/tests/test_iterutils.py index 94da99d..753dc37 100644 --- a/tests/test_iterutils.py +++ b/tests/test_iterutils.py @@ -311,7 +311,7 @@ class TestRemap(object): def test_prepop(self): """Demonstrating normalization and ID addition through prepopulating - the objects wth an enter callback. + the objects with an enter callback. """ base_obj = {'name': None, 'rank': None, diff --git a/tests/test_mathutils.py b/tests/test_mathutils.py index 4e8b487..9556f12 100644 --- a/tests/test_mathutils.py +++ b/tests/test_mathutils.py @@ -25,7 +25,7 @@ def test_clamp_examples(): assert 1 == clamp(7.7, upper=1) def test_clamp_transparent(): - """clamp(x) should equal x beacause both limits are omitted""" + """clamp(x) should equal x because both limits are omitted""" assert clamp(0) == 0 assert clamp(1) == 1 assert clamp(10**100) == 10**100 diff --git a/tests/test_urlutils.py b/tests/test_urlutils.py index e1570ab..924bf45 100644 --- a/tests/test_urlutils.py +++ b/tests/test_urlutils.py @@ -372,7 +372,7 @@ def test_netloc_slashes(): url.path = '/x/y/z' assert url.to_text() == 'ztp:/x/y/z' - # also works when the input doesn't includ '//' + # also works when the input doesn't include '//' url = URL() url.scheme = 'git+ftp' url.path = '/x/y/z/'