开源软件构建与测试

_service:extract_file:python-testtools.spec Changed

@@ -1,17 +1,17 @@
 Name:           python-testtools
-Version:        2.3.0
-Release:        12
+Version:        2.4.0
+Release:        3
 Summary:        Extensions to the Python unit testing framework
 License:        MIT
 URL:            https://launchpad.net/testtools
-Source0:        https://pypi.io/packages/source/t/testtools/testtools-%{version}.tar.gz
-
-Patch0001:      testtools-1.8.0-py3.patch
-Patch0002:      testtools-2.3.0-py37.patch
 
+Source0:        https://pypi.io/packages/source/t/testtools/testtools-%{version}.tar.gz
 BuildRequires:  python3-extras python3-mimeparse python3-pbr python3-setuptools python3-unittest2
 BuildRequires:  python3-traceback2 python3-testscenarios python3-sphinx python3-devel
 BuildArch:      noarch
+Patch0:         testtools-2.4.0-fix-py3-compat.patch
+Patch1:         testtools-2.4.0-fix_py39_test.patch
+Patch2:         Drop_traceback2_in_favor_of_traceback_and_remove_unused_linecache2.patch
 
 %description
 Testtools is a set of extensions to the Python standard library's unit testing framework. These
@@ -37,26 +37,17 @@
 This package contains HTML documentation for python-testtools.
 
 %prep
-%setup -q -n testtools-%{version}
-%patch0002 -p1
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-cd %{py3dir}
-%patch0001 -p1
-find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
-rm -f %{py3dir}/testtools/_compat2x.py %{_builddir}/testtools-%{version}/testtools/_compat3x.py
+%autosetup -n testtools-%{version} -p1
+rm -rf testtools.egg-info
 
 %build
+%py3_build
 PYTHONPATH=$PWD make -C doc html
-cd %{py3dir}
-%{__python3} setup.py build
 
 %install
-cd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%py3_install
 
 %check
-cd %{py3dir}
 make PYTHON=%{__python3} check
 
 %files -n python3-testtools
@@ -67,6 +58,15 @@
 %doc doc/_build/html/*
 
 %changelog
+* Sun Apr 24 2022 lvxiaoqian <xiaoqian@nj.iscas.ac.cn> - 2.4.0-3
+- Drop traceback2 in favor of traceback and remove unused linecache2
+
+* Sat Jan 08 2021 caodongxia <caodongxia@huawei.com> - 2.4.0-2
+- Fix test fail
+
+* Fri Aug 06 2021 liusheng <liusheng2048@gmail.com> - 2.4.0-1
+- Upgrade to version 2.4.0
+
 * Tue Aug 11 2020 zhangtao <zhangtao221@huawei.com> - 2.3.0-12
 - Del Python2-testtools python2 is EOL and we recommend python3

_service:extract_file:Drop_traceback2_in_favor_of_traceback_and_remove_unused_linecache2.patch Added

@@ -0,0 +1,47 @@
+From b6cf7daa7e0598de1b627b566a146f5ff6863274 Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Mon, 24 Aug 2020 22:32:19 +0800
+Subject: PATCH Drop traceback2 in favor of traceback and remove unused
+ linecache2
+
+diff --git a/requirements.txt b/requirements.txt
+index 1df0799d..a50bc02c 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -5,5 +5,4 @@
+ # but someone kindly uploaded a fixed version as 'python-mimeparse'.
+ python-mimeparse
+ unittest2>=1.0.0
+-traceback2
+ six>=1.4.0
+diff --git a/testtools/compat.py b/testtools/compat.py
+index 8a86433f..b6e54816 100644
+--- a/testtools/compat.py
++++ b/testtools/compat.py
+@@ -30,8 +30,6 @@
+ 
+ BytesIO = try_imports('StringIO.StringIO', 'io.BytesIO')
+ StringIO = try_imports('StringIO.StringIO', 'io.StringIO')
+-# To let setup.py work, make this a conditional import.
+-linecache = try_import('linecache2')
+ 
+ from testtools import _compat3x as _compat
+ 
+
+diff --git a/testtools/content.py b/testtools/content.py
+index faad04dd..b84818a9 100644
+--- a/testtools/content.py
++++ b/testtools/content.py
+@@ -17,10 +17,9 @@
+ import json
+ import os
+ import sys
++import traceback
+ 
+ from extras import try_import
+-# To let setup.py work, make this a conditional import.
+-traceback = try_import('traceback2')
+ 
+ from testtools.compat import (
+     _b,
+

_service:extract_file:testtools-1.8.0-py3.patch Deleted

_service:extract_file:testtools-2.3.0-py37.patch Deleted

@@ -1,54 +0,0 @@
-From 29004731f9c480b7c44a9c2605513d50d372898f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Thu, 17 May 2018 17:52:26 +0200
-Subject: PATCH Fix the tests on Python 3.7
-
-Exception's repr got changed not to include trailing comma
-
-Fixes https://github.com/testing-cabal/testtools/issues/270
----
- .travis.yml                                |  1 +
- testtools/tests/matchers/test_exception.py | 11 +++++++++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index 7f1f4db7..784608e0 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -5,6 +5,7 @@ python:
-   - "3.4"
-   - "3.5"
-   - "3.6"
-+  - "3.7-dev"
-   - "pypy"
- 
- install:
-diff --git a/testtools/tests/matchers/test_exception.py b/testtools/tests/matchers/test_exception.py
-index 6cd80af1..acd39252 100644
---- a/testtools/tests/matchers/test_exception.py
-+++ b/testtools/tests/matchers/test_exception.py
-@@ -32,15 +32,22 @@ class TestMatchesExceptionInstanceInterface(TestCase, TestMatchersInterface):
-     matches_matches = error_foo
-     matches_mismatches = error_bar, error_base_foo
- 
-+    if sys.version_info >= (3, 7):
-+        # exception's repr has changed
-+        _e = ''
-+    else:
-+        _e = ','
-+
-     str_examples = 
--        ("MatchesException(Exception('foo',))",
-+        ("MatchesException(Exception('foo'%s))" % _e,
-          MatchesException(Exception('foo')))
-         
-     describe_examples = 
-         ("%r is not a %r" % (Exception, ValueError),
-          error_base_foo,
-          MatchesException(ValueError("foo"))),
--        ("ValueError('bar',) has different arguments to ValueError('foo',).",
-+        ("ValueError('bar'%s) has different arguments to ValueError('foo'%s)."
-+         % (_e, _e),
-          error_bar,
-          MatchesException(ValueError("foo"))),
-

_service:extract_file:testtools-2.4.0-fix-py3-compat.patch Added

@@ -0,0 +1,36 @@
+diff -urN testtools-2.4.0/testtools/_compat2x.py testtools-2.4.0-new/testtools/_compat2x.py
+--- testtools-2.4.0/testtools/_compat2x.py	2015-11-08 01:27:33.000000000 +0800
++++ testtools-2.4.0-new/testtools/_compat2x.py	1970-01-01 08:00:00.000000000 +0800
+@@ -1,17 +0,0 @@
+-# Copyright (c) 2011 testtools developers. See LICENSE for details.
+-
+-"""Compatibility helpers that are valid syntax in Python 2.x.
+-
+-Only add things here if they *only* work in Python 2.x or are Python 2
+-alternatives to things that *only* work in Python 3.x.
+-"""
+-
+-__all__ = 
+-    'reraise',
+-    
+-
+-
+-def reraise(exc_class, exc_obj, exc_tb, _marker=object()):
+-    """Re-raise an exception received from sys.exc_info() or similar."""
+-    raise exc_class, exc_obj, exc_tb
+-
+diff -urN testtools-2.4.0/testtools/compat.py testtools-2.4.0-new/testtools/compat.py
+--- testtools-2.4.0/testtools/compat.py	2018-04-05 07:27:14.000000000 +0800
++++ testtools-2.4.0-new/testtools/compat.py	2021-08-06 10:55:13.294527126 +0800
+@@ -33,10 +33,7 @@
+ # To let setup.py work, make this a conditional import.
+ linecache = try_import('linecache2')
+ 
+-try:
+-    from testtools import _compat2x as _compat
+-except SyntaxError:
+-    from testtools import _compat3x as _compat
++from testtools import _compat3x as _compat
+ 
+ reraise = _compat.reraise
+

_service:extract_file:testtools-2.4.0-fix_py39_test.patch Added

_service Changed

_service:extract_file:testtools-2.3.0.tar.gz/.gitignore -> _service:extract_file:testtools-2.4.0.tar.gz/.gitignore Changed

_service:extract_file:testtools-2.3.0.tar.gz/.travis.yml -> _service:extract_file:testtools-2.4.0.tar.gz/.travis.yml Changed

_service:extract_file:testtools-2.3.0.tar.gz/AUTHORS -> _service:extract_file:testtools-2.4.0.tar.gz/AUTHORS Changed

@@ -1,4 +1,5 @@
 Aaron Bentley <aaron@aaronbentley.com>
+Adam Harwell <flux.adam@gmail.com>
 Andrew Bennetts <andrew@bemusement.org>
 Andrew Bennetts <andrew@puzzling.org>
 Benedikt Morbach <benedikt.morbach@googlemail.com>
@@ -21,10 +22,12 @@
 Gavin Panella <gavin@gromper.net>
 Gavin Panella <gavinpanella@gmail.com>
 Graham Binns <graham@canonical.com>
+Hugo <hugovk@users.noreply.github.com>
 James Westby <james.westby@canonical.com>
 Jamu Kakar <jkakar@kakar.ca>
 Javier Collado <javier.collado@gmail.com>
 Jelmer Vernooij <jelmer@samba.org>
+Jelmer Vernooĳ <jelmer@jelmer.uk>
 Joe Gordon <joe.gordon0@gmail.com>
 Jonathan Jacobs <jonathan@jsphere.com>
 Jonathan Lange <jml@canonical.com>
@@ -37,6 +40,7 @@
 Martin Packman <martin.packman@canonical.com>
 Martin Pool <mbp@canonical.com>
 Michael Hudson <michael.hudson@linaro.org>
+Miro Hrončok <miro@hroncok.cz>
 Monty Taylor <mordred@inaugust.com>
 Nikola Dipanov <nikola.djipanov@gmail.com>
 Raphael Badin <raphael.badin@canonical.com>
@@ -44,14 +48,17 @@
 Robert Collins <robert.collins@canonical.com>
 Robert Collins <robertc@lifelesswks>
 Robert Collins <robertc@robertcollins.net>
+Ross Burton <ross.burton@intel.com>
 Thomas Bechtold <tbechtold@suse.com>
 Thomas Herve <therve@redhat.com>
 Thomas Hervé <therve@gmail.com>
 Thomi Richards <thomi.richards@canonical.com>
 Thomi Richards <thomir@gmail.com>
 Tres Seaver <tseaver@agendaless.com>
+Ville Skyttä <ville.skytta@iki.fi>
 Vincent Ladeuil <v.ladeuil+lp@free.fr>
 Xiao Hanyu <xiaohanyu1988@gmail.com>
+hugovk <hugovk@users.noreply.github.com>
 rbtcollins <robertc@robertcollins.net>
 tim.cole@canonical.com <>
 wbond <will@wbond.net>

_service:extract_file:testtools-2.3.0.tar.gz/ChangeLog -> _service:extract_file:testtools-2.4.0.tar.gz/ChangeLog Changed

@@ -1,6 +1,27 @@
 CHANGES
 =======
 
+2.4.0
+-----
+
+* Release 2.4.0
+* Add myself to contributors list
+* Add support for Python 3.7 and 3.8
+* Cache pip directory
+* Test CI on PyPy3
+* Tell pip not to install for Python 3.4
+* Drop support for EOL Python 3.4
+* Extra space expected in PyPy output
+* PyCharm IDE unittest detection compatibility fix
+* Don't use eval()
+* Fix the tests on Python 3.7
+* Drop support for EOL Python 3.3
+* Ignore IDE metadata
+* Update classifiers
+* Remove old Python 2.6 code
+* Spelling fixes (#261)
+* Python 3.6 invalid escape sequence deprecation fixes (#262)
+
 2.3.0
 -----
 
@@ -18,10 +39,10 @@
 
 * Release 2.2.0
 * Depend on the extras 1.0.0 release
-* Unbreak fixtures test suite / use of gather_details
+* Unbreak fixtures test suite / use of gather\_details
 * UTF-8 encode Twisted logs (allenap)
 * Use inlineCallbacks instead of deferredGenerator
-* Fix _lp_release: NEXT is case sensitive
+* Fix \_lp\_release: NEXT is case sensitive
 
 2.1.0
 -----
@@ -30,16 +51,16 @@
 * Correct docs for skip deprecation
 * Add matchers for detecting emitted warnings
 * Revert usage of pyrsistent
-* Add unique_text_generator
-* Become compatible with newer Fixtures _setUp() API
+* Add unique\_text\_generator
+* Become compatible with newer Fixtures \_setUp() API
 * Better handling of KeyboardInterrupt
-* Fix example in docstring for `failed`
+* Fix example in docstring for \`failed\`
 * Move all Twisted code to twistedsupport package
 * Revert "Move all Twisted code to twistedsupport package"
 * Move all Twisted code to twistedsupport package
 * Add Always & Never matchers
 * Support TestResults without stop/shouldStop
-* Stop using deprecated `skip()` internally
+* Stop using deprecated \`skip()\` internally
 
 2.0.0
 -----
@@ -59,41 +80,41 @@
 * Missed one
 * 19.4.1 refers to importlib machinery. Avoid that
 * See if setuptools 19.5 is bad
-* PIP_VERSION is used by pip itself
+* PIP\_VERSION is used by pip itself
 * Correct spelling of 'less than 8', maybe
-* Use only pip 7.* on pypy3 & py3.2
+* Use only pip 7.\* on pypy3 & py3.2
 * Longer timeout not necessary
 * NEWS update
 * Handle case where Deferred fires after timeout
 * Explicitly separate fake stop method
 * Lint & copyright
-* NO_RESULT -> has_no_result
+* NO\_RESULT -> has\_no\_result
 * Make twistedsupport a package
-* Rename `successful` to `succeeded`
+* Rename \`successful\` to \`succeeded\`
 * Improve NEWS
 * Conditionally import matchers
 * Use non-inplace install and add a comment
 * New module for twisted support code
 * Minor documentation tweaks
-* Make no_result a constant
+* Make no\_result a constant
 * Style & documentation tweaks from review
 * Review tweaks
-* Import extract_result from correct location
+* Import extract\_result from correct location
 * expectThat works under AsynchronousDeferredRunTest
 * Correct string literal syntax
 * Avoid .format
 * Give up on some TODOs
 * Maybe we need to install our thing?
 * Add requirements for readthedocs
-* Move non-matcher code to _deferred
+* Move non-matcher code to \_deferred
 * Nicer links
 * Link to Twisted API docs
 * More todos
 * Documentation with examples
 * Pass the Deferred to the handlers
 * Docstring formatting
-* Use _on_deferred_result in _NoResult
-* Make _on_deferred_result transparent to Deferred
+* Use \_on\_deferred\_result in \_NoResult
+* Make \_on\_deferred\_result transparent to Deferred
 * Extract common Deferred logic
 * Use same error messages as Twisted
 * Matcher for Deferreds that have failed
@@ -102,9 +123,9 @@
 * Docstring formatting
 * Docstring
 * Move formatting to exception
-* Extract `extract_result`
+* Extract \`extract\_result\`
 * Matcher for no result
-* Actually use `skipException`
+* Actually use \`skipException\`
 * NEWS update
 * Suppress skip traceback based on skipException
 * Deprecate Python 2.6
@@ -123,7 +144,7 @@
 * Document early evaluation of details
 * Update NEWS
 * Deprecate TestCase.skip
-* Deprecate _BinaryMismatch.{expected,observed}
+* Deprecate \_BinaryMismatch.{expected,observed}
 * Make sure reference and actual align
 * Put expected on the right for binary mismatch
 * Fix typo
@@ -136,16 +157,16 @@
 * Better error message for MatchesListwise
 * NEWS update
 * Clarify some things
-* Move _cleanups reset to _reset
-* Rewrite patch tests using make_test_case
-* `throw` helper
-* Rewrite addCleanup tests in terms of make_test_case
-* Use method for value, to avoid `self` weirdness
+* Move \_cleanups reset to \_reset
+* Rewrite patch tests using make\_test\_case
+* \`throw\` helper
+* Rewrite addCleanup tests in terms of make\_test\_case
+* Use method for value, to avoid \`self\` weirdness
 * Move useful matchers to helper module
-* Move unique_id_gen to reset
+* Move unique\_id\_gen to reset
 * Clean up comments
 * No need for special case
-* Get pre_set_up & post_tear_down from scenario
+* Get pre\_set\_up & post\_tear\_down from scenario
 * Spell setUp consistently
 * Allow pre setUp & post tearDown to be set
 * Complete suite of tests
@@ -160,7 +181,7 @@
 * Latest Twisted doesn't run on Python 2.6
 * Non-deterministic test case
 * Simplify cleanup code
-* Rename all_sample_cases_scenarios to deterministic_sample_cases_scenarios
+* Rename all\_sample\_cases\_scenarios to deterministic\_sample\_cases\_scenarios
 * Treat tear down failure as a scenario
 * Begin to write scenario-based tests
 * Split run twice tests to separate case
@@ -168,7 +189,7 @@
 * Fix travis :(
 * Add testscenarios for use by tests
 * Handle failure in tearDown
-* Test _run_teardown, rather than tearDown
+* Test \_run\_teardown, rather than tearDown
 * Allow tests to be run twice
 * Don't use private APIs
 
@@ -178,36 +199,36 @@
 * Update NEWS for 1.8.1
 * Hide TestRecord and StreamToTestRecord
 * Old-fashioned set syntax
-* Abstract text_or_bytes
+* Abstract text\_or\_bytes
 * Add pyrsistent dependency to Travis CI
 * Change PRecord to PClass
-* Move test_dict_to_case near StreamToDict
+* Move test\_dict\_to\_case near StreamToDict
 * Don't use StreamToDict internally
-* _streamer -> _hook
+* \_streamer -> \_hook
 * StreamSummary with composition, not inheritance
 * Extract StreamToTestRecord base class
-* Move _make_content_type closer to where it is used
-* Put to_test_case logic on TestRecord
-* Make _status_map persistent
-* Move test_dict_to_case closer to test_dict definition
+* Move \_make\_content\_type closer to where it is used
+* Put to\_test\_case logic on TestRecord
+* Make \_status\_map persistent
+* Move test\_dict\_to\_case closer to test\_dict definition
 * Remove temporary variable 'case'
-* Extract got_file
-* Extract got_timestamp function
+* Extract got\_file
+* Extract got\_timestamp function
 * Move creation logic to TestRecord itself
 * Actually use TestRecord internally
 * Extract methods for making and updating record
-* Extract _make_content_type
-* Use `case` consistently, over `_inprogresskey`
+* Extract \_make\_content\_type
+* Use \`case\` consistently, over \`\_inprogresskey\`
 * Use name for interim states
 * Aspirational documentation
 * Remove VWS
 * Update PlaceHolder indentation
 * Restore & deprecate domap
-* Spell out `f` and `xs`
-* Drop `__metaclass__` declaration
-* Document confusing `domap`
+* Spell out \`f\` and \`xs\`
+* Drop \`\_\_metaclass\_\_\` declaration
+* Document confusing \`domap\`
 * Remove duplicate implementation of method
-* Allow event_log to be passed to result doubles
+* Allow event\_log to be passed to result doubles
 * Fix lint in testresult.real
 * Lint clear-up
 * Uncap test matrix entries for modern Twisted
@@ -226,7 +247,7 @@
 * Release 1.8.0
 * Switch to pbr as a build system
 * Add some custom matchers to make deferred log tests more readable
-* Simplify AsynchronousDeferredRunTest._run_core's StringIO handling
+* Simplify AsynchronousDeferredRunTest.\_run\_core's StringIO handling
 * Rewind the deferred test log before attaching it
 * Open 1.8.0 for dev
 * Release 1.7.1
@@ -257,32 +278,32 @@
 * Expand test matrix to include Python 3.4 and pypy3
 * Pin Pygments below 2.0 for our 3.2 build
 * Use unittest2 TestProgram implementation
-* Update testtools.compat.__all__
+* Update testtools.compat.\_\_all\_\_
 * Make discover run the same tests as 'make test'
 * Improve support for discovery on testtools.tests
 * Fixup travis. OOPS
 * Depend on unittest2
 * We now publish wheels of testtools
 * Fixed docstrings in content.py
-* Make text_content more explicit about the types that it accepts
+* Make text\_content more explicit about the types that it accepts
 * Fix unit tests which failed under pypy due to a change in the way tracebacks were reported
 * Release 1.1.0
 * Fix masking of fixture.setUp errors
 * Openning 1.0.1 for development
 * Release 1.0.0
 * Fix handling of uncatchable exceptions
-* Fix issue where using the skip* family of decorators still ran the setUp and tearDown test methods
+* Fix issue where using the skip\* family of decorators still ran the setUp and tearDown test methods
 * Document backwards compatibility policy
 * Document release pre-requisites
 * Opening 0.9.40 for development
 * Unbreak discovery from 0.9.38
 * Opening 0.9.39 for development
 * Bumped version number for release
-* Backport fix for load_tests in package modules
+* Backport fix for load\_tests in package modules
 * Implement discover import error detection on 2.6
 * Fix broken links to old mumak.net documentation
 * Go back to capitalized testtools for now
-* Fix rST error in `StreamResult`
+* Fix rST error in \`StreamResult\`
 * Initial cut of API changes
 * Ignore all the things
 * Some minor tweaks
@@ -296,7 +317,7 @@
 * Revert back to explicit test identification
 * Remove newline in url that broke the link in the docs
 * abandoned pull request revived to comply with comments in review
-* Raise a TypeError when text_content is passed bytes, so we get an error as early as possible
+* Raise a TypeError when text\_content is passed bytes, so we get an error as early as possible
 * Added failing test for python 3.4 unittest.expectedFailure decorator changes
 * Add optional message to assert(Not)In
 * Opening 0.9.36 for development
@@ -306,17 +327,17 @@
 * Don't try to release 'NEXT'
 * Add expectThat method to testtools.TestCase
 * Build docs as part of the Travis build
-* Add assert_that NEWS entry
-* Copy assertThat docstring on to assert_that
-* Add assert_that function documentation
-* Move assertThat tests to separate module and apply them to assert_that as well
-* Create assert_that function and use it from TestCase.assertThat
+* Add assert\_that NEWS entry
+* Copy assertThat docstring on to assert\_that
+* Add assert\_that function documentation
+* Move assertThat tests to separate module and apply them to assert\_that as well
+* Create assert\_that function and use it from TestCase.assertThat
 * Add NEWS entry for Python 2.4/2.5 code path removal
 * Use explanatory functions for gnarly exception handling logic
 * Use super correctly
 * Remove workaround for getincrementaldecoder not being in 2.4
 * Remove documentation suggestion that we support anything older than 2.6
-* Revert "Workaround 2.4 threading bug in test_spinner."
+* Revert "Workaround 2.4 threading bug in test\_spinner."
 * Use a context manager as suggested by a comment
 * Don't support Python 2.4 test method naming
 * Remove Python 2.4 deprecation warning special-casing
@@ -329,19 +350,19 @@
 * Use proper super call in MismatchError
 * Open 0.9.35 for dev
 * Release 0.9.34
-* Fix test_bom Python 3.3 test failure
+* Fix test\_bom Python 3.3 test failure
 * In Python 3.3, if there are duplicate test ids, tests.sort() will fail and raise TypeError
-* Add 'force_failure' feature to testtools.TestCase
+* Add 'force\_failure' feature to testtools.TestCase
 * Add testtools.StacktraceContent
 * Fix NEWS item sorting
 * Indicate failed imports in list-tests
 * Be more paranoid about list-tests behaviour
-* Cleanup sys.modules correctly in test_run
+* Cleanup sys.modules correctly in test\_run
 * run network test on the loopback interface only
 * Export AnyMatch properly
 * Some notes on discussing changes
 * Fix Typo in StreamResult docs
-* Export testtools.content.json_content properly
+* Export testtools.content.json\_content properly
 * Release 0.9.33
 * Fix StreamSummary counting of testsRun
 * Fix NEWS formatting
@@ -349,7 +370,7 @@
 * Add StackLinesContent, reimplement TracebackContent to use this new class
 * Remove unused code
 * Added missing line in NEWS file for features merged previously
-* Refactor testtools.compat._format_exc_info into two separate functions
+* Refactor testtools.compat.\_format\_exc\_info into two separate functions
 * Add the 'addDetailUniqueName' method to TestCase
 * Fix a KeysEqual bug
 * Setup gerrit metadata
@@ -388,7 +409,7 @@
 * Adds a CopyStreamResult which copies StreamResult events to multiple outputs
 * Adds a recording StreamResult for writing tests with
 * This defines a new sort of TestResult, StreamResult
-* Add a helper for decorating the result object given to ``case.(__call__/run)`` - DecorateTestCaseResult
+* Add a helper for decorating the result object given to \`\`case.(\_\_call\_\_/run)\`\` - DecorateTestCaseResult
 * Add support for timestamp events to Placeholder objects
 * Placeholder couldn't hold tags, which limits its use
 * The error message for setUp and tearDown upcall errors was broken on Python 3.4. (Monty Taylor, Robert Collins, #1140688)
@@ -400,17 +421,17 @@
 * Opening 0.9.30 for development
 * Release 0.9.29
 * Report filenames in upcall errors
-* Further fix to unicode_output_stream
-* Fix handling of io.StringIO in unicode_output_stream
+* Further fix to unicode\_output\_stream
+* Fix handling of io.StringIO in unicode\_output\_stream
 * Opening 0.9.29 for development
 * Release testtools-0.9.28
 * Add travis-ci continuous integration configuration
-* Fix epytext for *args
+* Fix epytext for \*args
 * Add a nosetests attr-like extension to enable more ways of filtering tests
 * Delete Python 2.4 only code
 * Instructions for tagging with git
 * Be clear on when HasLength passes or fails
-* Code quote *args and **kwargs
+* Code quote \*args and \*\*kwargs
 * Fix minor rST error
 * Whitespace correction
 * Correct URL for testing cabal
@@ -422,43 +443,43 @@
 * Refer to LICENSE, rather than README
 * Opening 0.9.28 for development
 * Release 0.9.27
-* * New matcher ``HasLength`` for matching the length of a collection.   (Robert Collins)
-* * New matcher ``HasLength`` for matching the length of a collection.   (Robert Collins)
-* * New matcher ``MatchesPredicateWithParams`` make it still easier to create   adhoc matchers. (Robert Collins)
-* * We have a simpler release process in future - see doc/hacking.rst.   (Robert Collins)
+* \* New matcher \`\`HasLength\`\` for matching the length of a collection.   (Robert Collins)
+* \* New matcher \`\`HasLength\`\` for matching the length of a collection.   (Robert Collins)
+* \* New matcher \`\`MatchesPredicateWithParams\`\` make it still easier to create   adhoc matchers. (Robert Collins)
+* \* We have a simpler release process in future - see doc/hacking.rst.   (Robert Collins)
 * Release 0.9.26
-* Brown paper bag fix: failed to document the need for setup to be able to use extras. Compounded by pip not supporting setup_requires
+* Brown paper bag fix: failed to document the need for setup to be able to use extras. Compounded by pip not supporting setup\_requires
 * Release 0.9.25
-* * ``python -m testtools.run --load-list`` will now preserve any custom suites   (such as ``testtools.FixtureSuite`` or ``testresources.OptimisingTestSuite``)   rather than flattening them.   (Robert Collins, #827175)
+* \* \`\`python -m testtools.run --load-list\`\` will now preserve any custom suites   (such as \`\`testtools.FixtureSuite\`\` or \`\`testresources.OptimisingTestSuite\`\`)   rather than flattening them.   (Robert Collins, #827175)
 * Update docs about 2.4 and 2.5 compatability
-* * Testtools will no longer override test code registered details called   'traceback' when reporting caught exceptions from test code.   (Robert Collins, #812793)
-* * Testtools now depends on extras, a small library split out from it to contain   generally useful non-testing facilities. Since extras has been around for a   couple of testtools releases now, we're making this into a hard dependency of   testtools. (Robert Collins)
+* \* Testtools will no longer override test code registered details called   'traceback' when reporting caught exceptions from test code.   (Robert Collins, #812793)
+* \* Testtools now depends on extras, a small library split out from it to contain   generally useful non-testing facilities. Since extras has been around for a   couple of testtools releases now, we're making this into a hard dependency of   testtools. (Robert Collins)
 * Post-release merge of 0.9.24
 * Release 0.9.24
 * Fix grammatical error
-* * ``testtools.run discover`` will now sort the tests it discovered. This is a   workaround for http://bugs.python.org/issue16709. Non-standard test suites   are preserved, and their ``sort_tests()`` method called (if they have such an   attribute). ``testtools.testsuite.sorted_tests(suite, True)`` can be used by   such suites to do a local sort. (Robert Collins, #1091512)
-* * ``ThreadsafeForwardingResult`` now defines a stub ``progress`` method, which   fixes ``testr run`` of streams containing progress markers (by discarding the   progress data). (Robert Collins, #1019165)
-* * ``testtools.run discover`` will now sort the tests it discovered. This is a   workaround for http://bugs.python.org/issue16709. Non-standard test suites   are preserved, and their ``sort_tests()`` method called (if they have such an   attribute). ``testtools.testsuite.sorted_tests(suite, True)`` can be used by   such suites to do a local sort. (Robert Collins, #1091512)
+* \* \`\`testtools.run discover\`\` will now sort the tests it discovered. This is a   workaround for http://bugs.python.org/issue16709. Non-standard test suites   are preserved, and their \`\`sort\_tests()\`\` method called (if they have such an   attribute). \`\`testtools.testsuite.sorted\_tests(suite, True)\`\` can be used by   such suites to do a local sort. (Robert Collins, #1091512)
+* \* \`\`ThreadsafeForwardingResult\`\` now defines a stub \`\`progress\`\` method, which   fixes \`\`testr run\`\` of streams containing progress markers (by discarding the   progress data). (Robert Collins, #1019165)
+* \* \`\`testtools.run discover\`\` will now sort the tests it discovered. This is a   workaround for http://bugs.python.org/issue16709. Non-standard test suites   are preserved, and their \`\`sort\_tests()\`\` method called (if they have such an   attribute). \`\`testtools.testsuite.sorted\_tests(suite, True)\`\` can be used by   such suites to do a local sort. (Robert Collins, #1091512)
 
 0.9.23
 ------
 
 * Release 0.9.23
-* * ``run.TestToolsTestRunner`` now accepts the verbosity, buffer and failfast   arguments the upstream python TestProgram code wants to give it, making it   possible to support them in a compatible fashion. (Robert Collins)
+* \* \`\`run.TestToolsTestRunner\`\` now accepts the verbosity, buffer and failfast   arguments the upstream python TestProgram code wants to give it, making it   possible to support them in a compatible fashion. (Robert Collins)
 * Add a Python 3 Trove entry
 * Restore test suite passing status on Python 3
 * Restore test suite compatability with Python 3.x
 * Adjust trunk for TestToolsTestRunner change
 * New matcher, AnyMatch
-* * ``testtools.run`` now supports the ``-f`` or ``--failfast`` parameter.   Previously it was advertised in the help but ignored.   (Robert Collins, #1090582)
-* * ``run.TestToolsTestRunner`` now accepts the verbosity, buffer and failfast   arguments the upstream python TestProgram code wants to give it, making it   possible to support them in a compatible fashion. (Robert Collins)
+* \* \`\`testtools.run\`\` now supports the \`\`-f\`\` or \`\`--failfast\`\` parameter.   Previously it was advertised in the help but ignored.   (Robert Collins, #1090582)
+* \* \`\`run.TestToolsTestRunner\`\` now accepts the verbosity, buffer and failfast   arguments the upstream python TestProgram code wants to give it, making it   possible to support them in a compatible fashion. (Robert Collins)
 * NEWS bump
 * New matcher: AnyMatch
 * Post 0.9.22 release fixup
 * Release 0.9.22
-* * ``content_from_file`` and ``content_from_stream`` now accept seek_offset and   seek_whence parameters allowing them to be used to grab less than the full   stream, or to be used with StringIO streams. (Robert Collins, #1088693)
+* \* \`\`content\_from\_file\`\` and \`\`content\_from\_stream\`\` now accept seek\_offset and   seek\_whence parameters allowing them to be used to grab less than the full   stream, or to be used with StringIO streams. (Robert Collins, #1088693)
 * Typo in doc and a fix for TestProgram being constructed without an explicit testRunner argument
-* Not zip_safe
+* Not zip\_safe
 * Post-release cleanup
 * Release 0.9.21
 * Re-expose DirContains
@@ -482,7 +503,7 @@
 * Release 0.9.17
 * Correct handling of text vs bytes in json content type (mgz)
 * Fix --list (lifeless)
-* * ``python -m testtools.run discover . --list`` now works. (Robert Collins)
+* \* \`\`python -m testtools.run discover . --list\`\` now works. (Robert Collins)
 * Epytext fixes
 * Fix epytext errors
 * Update documentation to refer correctly to supported Python versions
@@ -492,12 +513,12 @@
 * Split testtools.matchers into several submodules
 * Rename core to impl
 * NEWS entry
-* More __all__ stuff
+* More \_\_all\_\_ stuff
 * Add interface again
 * Rationalize imports
-* Clear out __init__
-* Move MatchesPredicate to _higherorder
-* Move MatchesRegex to _basic
+* Clear out \_\_init\_\_
+* Move MatchesPredicate to \_higherorder
+* Move MatchesRegex to \_basic
 * Split up the tests
 * Massive split
 * Flakes
@@ -509,20 +530,20 @@
 * Move the filesystem matchers out
 * Move the tests to match the module
 * TODOs
-* Create a package for matchers, move all of the existing matchers into _core and expose them all from the package's __init__
+* Create a package for matchers, move all of the existing matchers into \_core and expose them all from the package's \_\_init\_\_
 * Post-release bump
 * Release 0.9.16
 * Fix up  SameMembers
 * Fix a glitch
 * Include what's missing and what's extra
-* Move _format out
+* Move \_format out
 * Restore properly
 * Get the other matcher passing the tests
 * Explicitly encode JSON data
 * Drop support for 2.4 and 2.5
 * Add dict matchers.  Merges dict-matcher
 * Rename the matchers
-* Make it more clear what _CombinedMatcher is
+* Make it more clear what \_CombinedMatcher is
 * Rename dict of matchers to expected
 * Heaps of docstrings
 * Restore accidentally deleted docstring
@@ -560,19 +581,19 @@
 * Initial cut of dict matcher.  Really poor error reporting.  No docstrings
 * Fix JSON tests
 * Fix some tests to account for new py3k quirks
-* Fix json_content helper on pythons with a unicode native str type
+* Fix json\_content helper on pythons with a unicode native str type
 * Fix JSON content type test to not expect charset param
 * Reraising of exceptions in Python 3 is more reliable. (Martin gz)
 * Simply reraise from the exception instance on py3k
 * Only assert that a reraised traceback has the original as a tail
 * Add tests for compat.reraise details that fail on py3k
-* Add json_content
+* Add json\_content
 * Don't specify encoding for JSON.  Already known to be UTF8
 * Add a JSON content type
-* Add a json_content helper
+* Add a json\_content helper
 * New matcher, SameMembers
 * Hopefully a nice error message
-* Implement __str__
+* Implement \_\_str\_\_
 * Guarantee unhashable things can be handled
 * Initial cut of SameMembers
 * OK, it wasn't r261 that broke Jenkins, but rather, Jenkins broke between r260 and r261. Great
@@ -581,7 +602,7 @@
 * Open 0.9.16 for business
 * Clarification in hacking.rst
 * 0.9.15 ~~~~~~
-* ``ThreadsafeForwardingResult`` now forwards global tags as test-local tags, making reasoning about the correctness of the multiplexed stream simpler. This preserves the semantic value (what tags apply to a given test) while consuming less stream size (as no negative-tag statement is needed). (Robert Collins, Gary Poster, #986434)
+* \`\`ThreadsafeForwardingResult\`\` now forwards global tags as test-local tags, making reasoning about the correctness of the multiplexed stream simpler. This preserves the semantic value (what tags apply to a given test) while consuming less stream size (as no negative-tag statement is needed). (Robert Collins, Gary Poster, #986434)
 * Refactor tests.  Improve doc
 * Add ContainsAll matcher
 * Fix doc
@@ -595,9 +616,9 @@
 * Clear the tags once we send them
 * Failing test to reproduce the bug
 * A million tests for threadsafeforwarding result, and a bug fix
-* ConcurrentTestSuite now takes a wrap_result parameter
+* ConcurrentTestSuite now takes a wrap\_result parameter
 * Better docs
-* Parametrize wrap_result, rather than relying on inheritance
+* Parametrize wrap\_result, rather than relying on inheritance
 * Documentation tweaks
 * Add a TestResultDecorator that tags every test
 * pyflakes
@@ -608,16 +629,16 @@
 * More tests for global tags, addressing a logic bug
 * Start testing TSFR's tag support
 * Actually test the threadsafe bit, sort of
-* Split up test_forwarding_methods
-* Make _merge_tags a function
-* Change the API so that merge_tags takes a tuple of (new, gone) for both parameters
-* rewrite the tags_helper test to be a little clearer
+* Split up test\_forwarding\_methods
+* Make \_merge\_tags a function
+* Change the API so that merge\_tags takes a tuple of (new, gone) for both parameters
+* rewrite the tags\_helper test to be a little clearer
 * Make the event log when making the result
 * Make the results in the tests, rather than setUp
 * Fix the indentation!
 * Add test-result-decorator
 * Add test-by-test-result
-* Change get_parent() to simple attribute access
+* Change get\_parent() to simple attribute access
 * Better tag handling
 * Add TestByTestResult
 * Bring over TestResultDecorator
@@ -637,11 +658,11 @@
 * Externalize tag support as a bit of an experiment
 * Remove an incorrect part of the testing contract for Python 2.7 and 2.6
 * Delete a redundant test added during this branch
-* Simplify _add_reason a little
-* * ``PlaceHolder`` and ``ErrorHolder`` now support being given result details.   (Robert Collins)
+* Simplify \_add\_reason a little
+* \* \`\`PlaceHolder\`\` and \`\`ErrorHolder\`\` now support being given result details.   (Robert Collins)
 * Notes for 0.9.14
 * Restore private method that subunit relies on
-* Restore _exc_info_to_unicode so that subunit can continue to work with latest testtools
+* Restore \_exc\_info\_to\_unicode so that subunit can continue to work with latest testtools
 * Make the tests pass on Python 3
 * Release 0.9.13
 * Move stack trace logic to TracebackContent, simplify the way we handle verbose tracebacks. FullStackRunTest no longer aborts the test run if a test raises an error
@@ -654,7 +675,7 @@
 * Have everything use TracebackContent
 * Give TracebackContent the ability to format exceptions itself, rather than delegating to TestResult
 * Use the new helper
-* Add as_text, a content helper
+* Add as\_text, a content helper
 * I think this is the right thing to do
 * Asynchronous tests no longer hang when run with triial
 * Make sure that we actually capture the list of observers, rather than just storing a reference
@@ -666,19 +687,19 @@
 * Format properly
 * NEWS update
 * Make sure the repr of the callable passed to assertRaises is included in the error message generated when assertRaises fails
-* ``ThreadsafeForwardingResult`` no longer includes semaphore acquisition time in the test duration (for implicitly timed test runs). (Robert Collins, #914362)
-* ``MultiTestResult`` supports the ``tags`` method. (Graham Binns, Francesco Banconi, #914279)
+* \`\`ThreadsafeForwardingResult\`\` no longer includes semaphore acquisition time in the test duration (for implicitly timed test runs). (Robert Collins, #914362)
+* \`\`MultiTestResult\`\` supports the \`\`tags\`\` method. (Graham Binns, Francesco Banconi, #914279)
 * Fixed ThreadsafeForwardingResult so that it supports tags
 * Added a test for general tags()
 * Rob says MultiTestResult is fixed
 * Refactored TestResult.tags() and removed unnecessary reimplementations. Actually implemented tags() in the base class, too
 * Added tags() stubs to various TestResult implementations
 * Test suite fixes for Python 3 and pypy
-* Correctly skip test_real_path if os.symlink is unsupported
+* Correctly skip test\_real\_path if os.symlink is unsupported
 * Silly dancing over a single space difference in SyntaxError formatting depending on codec implementation
 * Seems pypy forgets to lower() the cookie encoding name
 * Avoid fixed-in-py3k-only resource usage bug with reading .tar.gz files
-* Close files properly in test_from_stream_eager_loading
+* Close files properly in test\_from\_stream\_eager\_loading
 * Respond to helpful review suggestions from Robert
 * End user docs
 * Allow passing arbitrary matcher to FileContains
@@ -694,7 +715,7 @@
 * Add SamePath
 * Add tarball matcher
 * Documentation
-* Add a first_only option to MatchesListwise
+* Add a first\_only option to MatchesListwise
 * Remove heaps of boiler plate by using MatchesPredicate
 * Add a matcher that just takes a predicate and a message
 * Add a short-circuit option to MatchesAll
@@ -707,41 +728,41 @@
 * Handle earlier Python versions
 * Python 3 work
 * Hide stack from MismatchErrors
-* Copy in exc_info_to_string, rather than the funky monkey patching
+* Copy in exc\_info\_to\_string, rather than the funky monkey patching
 * Better repr for results
 * Better repr for results
 * Align actual and reference = symbols
 * Prepare for release
-* Test that not passing multiline to text_repr defaults based on input
-* Add third state to multiline argument of text_repr and comment the internal logic
+* Test that not passing multiline to text\_repr defaults based on input
+* Add third state to multiline argument of text\_repr and comment the internal logic
 * Add cautions about unprintable strings to Mismatch documentation
 * Fix spelling error noted in review by jml
 * Extra tests to ensure multiline quoting is correct on Python 3
 * Avoid potential bytes and unicode mixing with DocTestMismatch on Python 2
 * Fix MatchesRegex mismatch description with a little transcoding dance
 * Make StartsWith and EndsWith stringify more like other matchers
-* Use text_repr for DoesNotStartWith and DoesNotEndWith describe methods
+* Use text\_repr for DoesNotStartWith and DoesNotEndWith describe methods
 * Hack over bump with bytes till things can be rewritten in a better way
-* Test and fix _BinaryMismatch.describe long forms using text_repr
-* Remove now unused to_text alias for unicode string type from compat
+* Test and fix \_BinaryMismatch.describe long forms using text\_repr
+* Remove now unused to\_text alias for unicode string type from compat
 * Make MismatchError stringification return appropriate types on Python 2
 * Use (possibly extended) repr rather than "%s" for matchee in verbose form of MismatchError
-* Messy first pass at implementing text_repr
-* Correct a couple of the examples for text_repr tests
+* Messy first pass at implementing text\_repr
+* Correct a couple of the examples for text\_repr tests
 * Tests for repr function to replace broken stringification schemes in matchers
 * Tests can be run independently now
-* Fix documentation to refer to fromExample, rather than non-existent from_example
+* Fix documentation to refer to fromExample, rather than non-existent from\_example
 * HACKING updates
 * Hide the stack using a RunTest method
-*  * Migrate assert* methods to use matchers  * Add optional message parameter to assertThat
+*  \* Migrate assert\* methods to use matchers  \* Add optional message parameter to assertThat
 * Remove the word 'present', which is unnecessary
 * Review changes
-* *  ``MatchesException`` now permits a tuple of types rather than a single type   (when using the type matching mode).  (Robert Collins)
+* \*  \`\`MatchesException\`\` now permits a tuple of types rather than a single type   (when using the type matching mode).  (Robert Collins)
 * Port assertIsInstance to matchers
 * Add an IsInstance matcher
 * assertNotIn using assertThat
-* Reduce spelling of assert* functions which call assertThat
-* * assertThat accepts a message which will be used to annotate the matcher. This   can be given as a third parameter or as a keyword parameter. (Robert Collins)
+* Reduce spelling of assert\* functions which call assertThat
+* \* assertThat accepts a message which will be used to annotate the matcher. This   can be given as a third parameter or as a keyword parameter. (Robert Collins)
 * More convert-to-matchers tweaks
 * Migrate assertIn to be matcher based
 * New matcher Contains
@@ -754,12 +775,12 @@
 * Correctly handle unicode output from doctest example in DocTestMatches
 * NEWS update
 * Trailing whitespace nit
-* Implement _NonManglingOutputChecker class to work around doctest problems in recent Python versions
+* Implement \_NonManglingOutputChecker class to work around doctest problems in recent Python versions
 * Correct tests to expect unicode from describe and Python 3 str
 * Oh, and the bug itself
 * assertThat docs & NEWS update for change
 * Add MismatchError, with tests. Change assertThat to raise MismatchError rather than AssertionError. Fixes bug 804127, I hope
-* Add 'to_text', a compatibility helper that turns an object into a unicode string
+* Add 'to\_text', a compatibility helper that turns an object into a unicode string
 * Failing test
 * Documentation for placeholders
 * Don't include a symlink to NEWS, instead generate docs on the fly
@@ -798,7 +819,7 @@
 * Fix for when tests are run from other directory
 * Some docs
 * Add a script that runs the tests against all installed Pythons
-* Move _lp_release into 'scripts'
+* Move \_lp\_release into 'scripts'
 * Make the directory
 * Update NEWS to reflect mgz's initial work on stack frame bug
 * Update NEWS to reflect mgz's contribution
@@ -810,19 +831,19 @@
 * Allow MatchesException to take any matcher
 * Don't show testtools' own stack frames when showing errors in test runs
 * Switch to using a FunctionFixture, per Rob's suggestion
-* Add a new matcher ``AllMatch``
-* Change gather_details to take dicts, not detailed objects
+* Add a new matcher \`\`AllMatch\`\`
+* Change gather\_details to take dicts, not detailed objects
 * Correct the spelling for AfterPreprocessing
 * Micro-optimize
 * Fix typo
-* Change gather_details to take a dict, rather than detailed objects
+* Change gather\_details to take a dict, rather than detailed objects
 * Docstring update
 * Make the error message a little better
 * Oh, actually, make it work. Update the description tests
 * Update description test
-* Allow value_re to be a matcher
+* Allow value\_re to be a matcher
 * Use MatchesRegex internally in MatchesException. Change MatchesRegex to have a nicer error message
-* Fix test_traceback_formatting to work correctly with Windows
+* Fix test\_traceback\_formatting to work correctly with Windows
 * NEWS update
 * Completely unused code
 * Direct tests for assertThat output
@@ -832,8 +853,8 @@
 * More NEWS
 * Docs and export
 * Document FixtureSuite
-* Tests for safe_hasattr
-* Move safe_hasattr
+* Tests for safe\_hasattr
+* Move safe\_hasattr
 * Be explicit in our higher level tests about what levels of the stack we want to see
 * Make sure we show testtools own stack levels during run
 * Use matchers for better tests
@@ -854,7 +875,7 @@
 * Docs & NEWS update
 * Add a 'byEquality' helper
 * Display less boilerplate in test failures and errors
-* Rename test_testtools to test_testcase for greater consistency
+* Rename test\_testtools to test\_testcase for greater consistency
 * Revert previous change, since it breaks the test suite
 * Manually merge in the diff
 * Incrementally improve DocTestMatchers handling of unicode
@@ -872,7 +893,7 @@
 * Many fixes based on testing against staging
 * Clean up
 * Wrap unicode streams on Python 2 so writing as well as printing unicode to them works
-* Use the right APP_NAME
+* Use the right APP\_NAME
 * Some refactoring
 * Instrument more. Create the new milestone. Mark bugs as fixed
 * Get the release name from NEWS
@@ -881,10 +902,10 @@
 * Correctly spell next
 * Restore matchers
 * Move the "Run tests" line closer to OK
-* Incomplete fix for using unicode with DocTestMatches, needs doctest._indent issue fixing still
+* Incomplete fix for using unicode with DocTestMatches, needs doctest.\_indent issue fixing still
 * Oh man I hope this works
 * Python 3 fixes. Test suite now runs with Python 3
-* Add public matchers to testtools.matchers.__all__
+* Add public matchers to testtools.matchers.\_\_all\_\_
 * Also specially mark up tracebacks when we convert them to strings
 * Work with Python 3
 * NEWS update
@@ -910,34 +931,34 @@
 * Flakes
 * New convenience methods, assertIsNone and assertIsNotNone
 * NEWS update and a formatting cleanup
-* * Add convenience methods assertIsNone and assertIsNotNone
-* * New GreaterThan matcher
+* \* Add convenience methods assertIsNone and assertIsNotNone
+* \* New GreaterThan matcher
 * 0.9.11 released
 * release 0.9.11
 * NEWS entry
 * LICENSE vs README normalization
 * Add myself to the authors list
-* Add tests for error_callback
-* Add an error_callback parameter to try_import and try_imports
+* Add tests for error\_callback
+* Add an error\_callback parameter to try\_import and try\_imports
 * A bunch of improvements to detail & fixture handling, courtesy Gavin Panella
-* Hide copy_content, it's internal only
-* Expose gather_details from __all__
+* Hide copy\_content, it's internal only
+* Expose gather\_details from \_\_all\_\_
 * NEWS update, make sure Gavin's in the credits
-* Improve copy_content()'s docstring
+* Improve copy\_content()'s docstring
 * Fix closure error when gathering multiple details from a fixture
 * Gather details from fixtures that fail to set-up
-* Change gather_details()'s signature and update the docstring
-* Change TestCase._gather_details() into a plain function so that it can be reused elsewhere
+* Change gather\_details()'s signature and update the docstring
+* Change TestCase.\_gather\_details() into a plain function so that it can be reused elsewhere
 * Use super, rather than upcalling
 * use super() in setUp and tearDown
 * Thanks so much to mgz
-* * Additional compat helper for ``BytesIO`` for libraries that build on   testtools and are working on Python 3 porting. (Robert Collins)
+* \* Additional compat helper for \`\`BytesIO\`\` for libraries that build on   testtools and are working on Python 3 porting. (Robert Collins)
 * Add a BytesIO alias for use when writing bytes aware code
 * Refix various problems that broke Python 3 support
 * Land allenap's change to LessThan
 * Update documentation for MatchesStructure, make it correct
 * Another test for LessThan mismatch descriptions that reveals the order in which the expected and observed values appear
-* Rewrite details_to_str as line-bsaed rather than char based
+* Rewrite details\_to\_str as line-bsaed rather than char based
 * Correct the message than LessThan() provides on mismatch
 * Release 0.9.10
 * Include the doc directory in sdist, making testtools installable from PyPI again (Tres Seaver)
@@ -970,8 +991,8 @@
 * Slightly better markup
 * Clean up errors
 * Correct REST
-* * added basic documentation on how to use testtools with distutils
-* * Fixes TestCommand import and reexports it from the testtools package * Adds a sample setup.cfg configuration for the distutils TestCommand   to demonstrate the proper usage of the command and so that   ``python setup.py test`` may actually do something useful by default
+* \* added basic documentation on how to use testtools with distutils
+* \* Fixes TestCommand import and reexports it from the testtools package \* Adds a sample setup.cfg configuration for the distutils TestCommand   to demonstrate the proper usage of the command and so that   \`\`python setup.py test\`\` may actually do something useful by default
 * Catch both NotBranchError /and/ NoworkingTree as different versions of bzr seem to raise a different error
 * Catch NoWorkingTree rather than NotBranchError
 * Support building a snapshot from something that is not a bzr working tree
@@ -987,13 +1008,13 @@
 * Copyright bump
 * Actually run the new tests
 * Style changes
-* More tests for attach_file, make lazy read work
-* read_now => lazy_read, as per review
-* Change the order of parameters to attach_file
+* More tests for attach\_file, make lazy read work
+* read\_now => lazy\_read, as per review
+* Change the order of parameters to attach\_file
 * Move attachFile from TestCase to be a standalone function
 * Fix up the documentation
-* Move Content.from_stream to be content_from_stream
-* Delete from_text
+* Move Content.from\_stream to be content\_from\_stream
+* Delete from\_text
 * Copyright bump
 * Clarify copyright: correct owners and dates
 * Make something easier
@@ -1003,7 +1024,7 @@
 * Add stuff about them in the manual
 * Some documentation for MatchesListwise
 * Update NEWS
-* Rename ``EachOf`` to ``MatchesListwise``
+* Rename \`\`EachOf\`\` to \`\`MatchesListwise\`\`
 * New ExpectedException class
 * Update the manual
 * NEWS for my change
@@ -1011,30 +1032,30 @@
 * Tweaks
 * Add option regular expression matching logic to MatchesException
 * NEWS, copyright bumps, docstring
-* Add __future__ import
+* Add \_\_future\_\_ import
 * Add ExpectedException
 * Fix some trivial API doc generation issues
 * More fixes to epytext
 * Fix some epytext failures
 * Don't emit warnings on lucid
-* * Use unittest2 exception classes if available. (Jelmer Vernooij)
+* \* Use unittest2 exception classes if available. (Jelmer Vernooij)
 * Use unittest2 exception classes if available
 * Update the README to point at the other docs, and clarify that the copyright is joint
 * Re-export the eager loading convenience
-* Add eager loading options to from_file and from_stream
+* Add eager loading options to from\_file and from\_stream
 * More documentation
 * attachFile helper
 * Update NEWS and MANUAL
 * Remove duplication
 * Basic convenience method for reading content from a file
-* Make it a classmethod, and make text_content one too
+* Make it a classmethod, and make text\_content one too
 * Update NEWS
-* Add a `stream_content` helper
+* Add a \`stream\_content\` helper
 * Republish StringIO through compat to avoid repeated code
 * PEP 8
 * Mention the difference between Python 2.7's startTestRun and ours in the docstring
-* Add all matchers to matchers __all__, fixing bug 692158
-* Make sure all matchers are in matchers __all__
+* Add all matchers to matchers \_\_all\_\_, fixing bug 692158
+* Make sure all matchers are in matchers \_\_all\_\_
 * Vastly improved documentation
 * Fix reST and add overview to index<
 * Use the overview document for the PyPI release
@@ -1045,15 +1066,15 @@
 * Changes -------
 * 0.9.8 was released
 * Release 0.9.8
-* Tests will now pass on Python 2.6.4 : an ``Exception`` change made only in 2.6.4 and reverted in Python 2.6.5 was causing test failures on that version. (Martin gz, #689858)
-* Avoid issue with broken __unicode__ method on some Python 2.6 minor versions
-* Workaround 2.4 threading bug in test_spinner
-* Avoid race condition in test_spinner.TestRunInReactor.test_clean_running_threads due to twisted threadpool not joining stopped workers
+* Tests will now pass on Python 2.6.4 : an \`\`Exception\`\` change made only in 2.6.4 and reverted in Python 2.6.5 was causing test failures on that version. (Martin gz, #689858)
+* Avoid issue with broken \_\_unicode\_\_ method on some Python 2.6 minor versions
+* Workaround 2.4 threading bug in test\_spinner
+* Avoid race condition in test\_spinner.TestRunInReactor.test\_clean\_running\_threads due to twisted threadpool not joining stopped workers
 * update NEWS
 * merge trunk
 * add AfterPreprocessing
-* ``assertIsInstance`` supports a custom error message to be supplied, which is necessary when using ``assertDictEqual`` on Python 2.7 with a ``testtools.TestCase`` base class. (Jelmer Vernooij)
-* ``MismatchesAll.describe`` no longer appends a trailing newline. (Michael Hudson-Doyle, #686790)
+* \`\`assertIsInstance\`\` supports a custom error message to be supplied, which is necessary when using \`\`assertDictEqual\`\` on Python 2.7 with a \`\`testtools.TestCase\`\` base class. (Jelmer Vernooij)
+* \`\`MismatchesAll.describe\`\` no longer appends a trailing newline. (Michael Hudson-Doyle, #686790)
 * add MatchesSetwise
 * add MatchesRegex
 * add EachOf and MatchesStructure matchers
@@ -1065,7 +1086,7 @@
 * Support optional 'msg' argument to TestCase.assertIsInstance
 * Fix bug 688724 by implementing 'all' for Python 2.4. (mgz)
 * Expose 'all' from compat and implement it for Python 2.4
-* Make use of StringIO in testtools.tests.test_run Python 3 compatible
+* Make use of StringIO in testtools.tests.test\_run Python 3 compatible
 * Let stdout default to sys.stdout in TestProgram
 * Use shiny new parallel test facility for testr
 * Explain the startTestRun behaviour in testtools
@@ -1076,11 +1097,11 @@
 * Whitespace correction
 * Functional programming ftw!
 * Tell testr how to use --load-list now that it exists
-* * ``testtools.run`` now supports ``--load-list``, which takes a file containing   test ids, one per line, and intersects those ids with the tests found. This   allows fine grained control of what tests are run even when the tests cannot   be named as objects to import (e.g. due to test parameterisation via   testscenarios). (Robert Collins)
+* \* \`\`testtools.run\`\` now supports \`\`--load-list\`\`, which takes a file containing   test ids, one per line, and intersects those ids with the tests found. This   allows fine grained control of what tests are run even when the tests cannot   be named as objects to import (e.g. due to test parameterisation via   testscenarios). (Robert Collins)
 * Fix thinko - first param is program is ignored
 * Refactor for reusability
 * Forgot to actually assert that list worked
-* * ``testtools.run`` now supports ``-l`` to list tests rather than executing   them. This is useful for integration with external test analysis/processing   tools like subunit and testrepository. (Robert Collins)
+* \* \`\`testtools.run\`\` now supports \`\`-l\`\` to list tests rather than executing   them. This is useful for integration with external test analysis/processing   tools like subunit and testrepository. (Robert Collins)
 * Fix some more glitches
 * Remove whack
 * Grammar change
@@ -1108,11 +1129,11 @@
 * Lots of rst fixes
 * End-to-end first draft
 * Docstring tweaks
-* Make cleanup running use run_user and make the run_user error handler understand MultipleExceptions.  Makes the whole thing easier to follow
+* Make cleanup running use run\_user and make the run\_user error handler understand MultipleExceptions.  Makes the whole thing easier to follow
 * Pass through kwargs
 * Skip unit tests for optional dependencies, rather than eliding them
 * New EndsWith matcher
-* Go back to using repr for exception types in MatchesException.__str__
+* Go back to using repr for exception types in MatchesException.\_\_str\_\_
 * Start of manual for test authors, based on current manual
 * Tweaks to HACKING
 * Whitespace
@@ -1122,7 +1143,7 @@
 * Always run the deferred run tests
 * Skip the spinner tests, rather than elide them
 * Move responsibility for running cleanups to RunTest
-* Add 'try_import' and 'try_imports'
+* Add 'try\_import' and 'try\_imports'
 * Polymorphism!
 * I am a tool
 * Nicer formatting
@@ -1154,13 +1175,13 @@
 * Convert MatchesException tests to the interface mixin
 * Add a Raises matcher
 * Add MatchesException matcher
-* Use try_import and try_imports in actual code
-* Change the helpers to get *any* object
+* Use try\_import and try\_imports in actual code
+* Change the helpers to get \*any\* object
 * Document new helpers
 * Raise an error if no alternative provided and can't import a module
 * Add to all
 * Support fallback imports
-* __all__
+* \_\_all\_\_
 * Make the tests more robust
 * Handle submodules
 * Add the twisted log unconditionally
@@ -1184,19 +1205,19 @@
 * Move fixture tests to a separate module so we can import optionally
 * Only run fixture support tests when fixtures is installed
 * Add a .testr.conf
-* * ``testools.TestCase.useFixture`` has been added to glue with fixtures nicely.   (Robert Collins)
+* \* \`\`testools.TestCase.useFixture\`\` has been added to glue with fixtures nicely.   (Robert Collins)
 * Update manual to describe how to run testtools.run on Python 2.4
 * Use deferredGenerator rather than inlineCallbacks
 * Don't use inlineCallbacks, instead use deferredGenerator, since it works on Python 2.4
-* * ``testools.TestCase.useFixture`` has been added to glue with fixtures nicely.   (Robert Collins)
+* \* \`\`testools.TestCase.useFixture\`\` has been added to glue with fixtures nicely.   (Robert Collins)
 * Don't need twisted to run tests
 * Skip signal tests on non-POSIX platforms
 * Upcall exceptions so that we can work in Python 2.4
 * Avoid functools or twisted dependency by updating wrapper function metadata inline
 * UTF-8 encoded text needs the b marker on py3k
-* Make test_preserve_signal_handler valid on windows by only expecting as many handlers as will be created
+* Make test\_preserve\_signal\_handler valid on windows by only expecting as many handlers as will be created
 * On non-posix platforms skip tests that require posix signal semantics
-* Just call Exception.__init__ rather than using super for Python 2.4 compatibility
+* Just call Exception.\_\_init\_\_ rather than using super for Python 2.4 compatibility
 * Treat addUnexpectedSuccess as addFailure if the underlying result does not support addUnexpectedSuccess
 * NEWS update
 * Translate addUnexpectedSuccess to addFailure instead of addSuccess
@@ -1224,14 +1245,14 @@
 * News!
 * Bring the behaviour in line with the documentation
 * Improve manual for RunTest handling
-* Extend the decorator to take kwargs and pass them on. Documentation, and rename to grammatically correct run_test_with
+* Extend the decorator to take kwargs and pass them on. Documentation, and rename to grammatically correct run\_test\_with
 * Add a decorator for specifying the RunTest object to use
 * Factor out the bit that gets the test method
-* Add a class variable, run_tests_with, to allow controlling which runner to run tests with
+* Add a class variable, run\_tests\_with, to allow controlling which runner to run tests with
 * Make the runTest argument actually work
 * Done!
-* More tests, allow customization of failureException in assert_fails_with
-* First pass at assert_fails_with
+* More tests, allow customization of failureException in assert\_fails\_with
+* First pass at assert\_fails\_with
 * Fix the version number
 * Release documentation tweaks
 * Update NEWS for 0.9.7 release
@@ -1246,11 +1267,11 @@
 * Manual updates, todos, docstrings
 * Scary
 * Scarier docstring
-* Rename _Spinner to Spinner, now that it's in a private module
+* Rename \_Spinner to Spinner, now that it's in a private module
 * Move the reactor spinning stuff into a separate module
 * Move the spinner tests to a different module
-* Make run() responsible for running _clean(), and add a state-based thing for getting at junk
-* Rename _Spinner.clean to _Spinner._clean, add a get_junk() method
+* Make run() responsible for running \_clean(), and add a state-based thing for getting at junk
+* Rename \_Spinner.clean to \_Spinner.\_clean, add a get\_junk() method
 * whitespace
 * Add a test to verify that we only call addError once
 * Test faster keyboard interrupt
@@ -1274,15 +1295,15 @@
 * Raise errors when the reactor is unclean
 * Stop using trial
 * Another todo
-* Tests for the not_reentrant decorator
+* Tests for the not\_reentrant decorator
 * Docs
-* Tests for extract_result
+* Tests for extract\_result
 * XXX comments and tests
 * Start to implement reactor cleaning, but doing it wrong. Should be only cleaning up stuff that wasn't there before
-* Tweak tests to call _Spinner class directly
+* Tweak tests to call \_Spinner class directly
 * Expand the function into a much bigger class
 * Extract the re-entrancy check
-* Make a run_in_reactor function that has timeouts
+* Make a run\_in\_reactor function that has timeouts
 * Make the damn thing work, crappily
 * Add an AsynchronousDeferredRunTest class and a test for it that's actually no good
 * Rename DeferredRunTest to SynchronousDeferredRunTest
@@ -1294,8 +1315,8 @@
 * Remove needless metaclass declaration
 * Cleanups can now report multiple exceptions
 * Enchance addCleanups for Fixtures
-* Add test and minimal fix for __details dict being shared among cloned TestCases
-* * Code duplication between assertEqual and the matcher Equals has been removed
+* Add test and minimal fix for \_\_details dict being shared among cloned TestCases
+* \* Code duplication between assertEqual and the matcher Equals has been removed
 * Code duplication between assertEqual and the matcher Equals has been removed
 * Set the license and the long description. Useful for publishing to PyPI
 * Make the release process more prescriptive. Add an item about tagging the release
@@ -1312,11 +1333,11 @@
 * Group the tests which rely on constructor details together
 * Add a place-holder test case
 * Add optional parameters to Mismatch
-* Avoid exc_info cycles in several places and comment on trickier ones
-* Rename PLAIN_TEXT to UTF8_TEXT, the code must match the documentation
+* Avoid exc\_info cycles in several places and comment on trickier ones
+* Rename PLAIN\_TEXT to UTF8\_TEXT, the code must match the documentation
 * New LessThan matcher
 * NEWS
-* Cheat. Return the results of _dispatch always
+* Cheat. Return the results of \_dispatch always
 * Pass back the results we get
 * Update years in the LICENSE file
 * Add TestCase.patch() and new testtools.monkey module for help with monkey-patching
@@ -1332,7 +1353,7 @@
 * Don't look for the monkey tests
 * Just not needed
 * Add patch() support to TestCase
-* Initial implementation of try_import
+* Initial implementation of try\_import
 * More NEWS
 * I can't believe we let this happen
 * Add an Is matcher
@@ -1342,7 +1363,7 @@
 * Copyright, wuu
 * Whitespace
 * Docstring formatting
-* Add UTF8_TEXT helper
+* Add UTF8\_TEXT helper
 * Release testtools 0.9.5
 * Handle string exceptions (mgz)
 * Enable test for string exceptions in test results
@@ -1355,7 +1376,7 @@
 * Test exposing issue with trying to decode None for unicode traceback
 * Whitespace, flakes
 * - All old-style classes are now new-style classes
-* Make _details_to_str unicode correct, for really finally the absolute last time
+* Make \_details\_to\_str unicode correct, for really finally the absolute last time
 * Out of date MANIFESTS make for bad tarballs
 * Release 0.9.4
 * Really get unicode conversion working in testresult.real.TestResult
@@ -1369,27 +1390,27 @@
 * Copyright bump
 * Do not generate str objects for StringException's internally
 * testtools.utils has been renamed to testtools.compat. Importing testtools.utils will now generate a deprecation warning
-* Move Python 2 _StringException argument type check to __init__ from stringify methods
+* Move Python 2 \_StringException argument type check to \_\_init\_\_ from stringify methods
 * Fix Python 3.1 support - remove the use of iteritems
-* Unbreak test_assertion_text_shift_jis for Pythons with a unicode str type
+* Unbreak test\_assertion\_text\_shift\_jis for Pythons with a unicode str type
 * Add NEWS for unicode tracebacks on Python 2
-* Make StringException.__str__ return UTF-8 rather than ascii/replace to prepare for merge
+* Make StringException.\_\_str\_\_ return UTF-8 rather than ascii/replace to prepare for merge
 * Don't encode output as UTF-8 for TestNonAsciiResults
 * Change a test from using iso-8859-7 to iso-8859-5 which doesn't happen to have the test character on the same codepoint as iso-8859-1
 * Avoid problem introduced with fix to Python bug #1031213 by ignoring the SyntaxError line and rereading the file instead
 * Document in tests the problems caused by CPython patch for issue #1031213
-* Allow for mangling in shift_jis test if the exception encoding is incompatible
+* Allow for mangling in shift\_jis test if the exception encoding is incompatible
 * Allow detect encoding tests to work when a Python implementation may object to compiling them
 * getlocale can return None if no locale is set, default to ascii
 * Trivial issues seen when scanning the diff for review
-* Move most of utils module to compat and put iterate_tests in testsuite module
+* Move most of utils module to compat and put iterate\_tests in testsuite module
 * Fix and test a bug with encoding of SyntaxError lines
 * Make Jython skip unicode filesystem tests correctly again
-* Sanitise unicode_output_stream a bit and add some tests, needs more work
-* Revert no longer needed cosmetic changes to test_content
-* Unbreak test_non_ascii_dirname from IronPython returning filesystem encoding as None
-* Found `ascii` function in Python 3 which saves some reimplementation
-* Fix test_traceback_rechecks_encoding which got broken when adding Python 3 support
+* Sanitise unicode\_output\_stream a bit and add some tests, needs more work
+* Revert no longer needed cosmetic changes to test\_content
+* Unbreak test\_non\_ascii\_dirname from IronPython returning filesystem encoding as None
+* Found \`ascii\` function in Python 3 which saves some reimplementation
+* Fix test\_traceback\_rechecks\_encoding which got broken when adding Python 3 support
 * Poke encoding specific code in TestNonAsciiResults some more
 * Document and polish test discovery support
 * Capitals for python in the MANUAL
@@ -1400,23 +1421,23 @@
 * Make final problem test for Python 3 run rather than skip
 * Changes to make tests work on Python 3, and a short term hack to make output robust
 * Polish the discovery support
-* * Thanks to a patch from James Westby testtools.matchers.Mismatch can now   supply a get_details method, which assertThat will query to provide   additional attachments. This can be used to provide additional detail   about the mismatch that doesn't suite being included in describe(). For   instance, if the match process was complex, a log of the process could be   included, permitting debugging
+* \* Thanks to a patch from James Westby testtools.matchers.Mismatch can now   supply a get\_details method, which assertThat will query to provide   additional attachments. This can be used to provide additional detail   about the mismatch that doesn't suite being included in describe(). For   instance, if the match process was complex, a log of the process could be   included, permitting debugging
 * Rename details from Mismatches that clash with already added ones
-* Switch get_details to return a dict
+* Switch get\_details to return a dict
 * Fixes from Rob's review, thanks
 * Add a getDetails that returns  to the Mismatch class
 * If getDetails is on Mismatch then thunk the results through to addDetail
-* * testtools.testresults.real._StringException will now answer __str__ if its   value is unicode by encoding with UTF8, and vice versa to answer __unicode__.   This permits subunit decoded exceptions to contain unicode and still format   correctly
+* \* testtools.testresults.real.\_StringException will now answer \_\_str\_\_ if its   value is unicode by encoding with UTF8, and vice versa to answer \_\_unicode\_\_.   This permits subunit decoded exceptions to contain unicode and still format   correctly
 * Add TestCase.skipTest as per Python2.7
 * Support python3.1
 * Fix a bunch of boneheaded errors in TestNonAsciiResults
-* * James Westby has supplied test discovery support using the Python 2.7   TestRunner in testtools.run. This requires the 'discover' module. This   closes bug #250764
+* \* James Westby has supplied test discovery support using the Python 2.7   TestRunner in testtools.run. This requires the 'discover' module. This   closes bug #250764
 * Add (C)/License information
 * Comment on the changes made to TestProgram
-* Move has_discover = True until we know we have set up everything we need
+* Move has\_discover = True until we know we have set up everything we need
 * Import Queue class from queue/Queue module to make life less confusing
-* Ignore __pycache__ directories, and ./build which setup.py creates
-* Fix TestTextTestResult.test_stopTestRun_shows_details yet again for another ZeroDivisionError message variation
+* Ignore \_\_pycache\_\_ directories, and ./build which setup.py creates
+* Fix TestTextTestResult.test\_stopTestRun\_shows\_details yet again for another ZeroDivisionError message variation
 * Remove relative import in testtools.testresult to make package work in py3k again
 * Support discovery by backporting code from python2.7
 * PEP 8 style fixes raised in review
@@ -1427,10 +1448,10 @@
 * First pass at implementing unicode tracebacks for Python 2
 * Time for 0.9.3
 * When a cleanUp or tearDown exception occurs, it is now accumulated as a new traceback in the test details, rather than as a separate call to addError / addException. This makes testtools work better with most TestResult objects and fixes bug #335816
-* PLAIN_TEXT helper
+* PLAIN\_TEXT helper
 * Tweak content type tests without changing content
 * Add a new "Annotation" matcher. It doesn't do anything, but it lets you add strings to other matchers
-* Remove __repr__ thing from NEWS
+* Remove \_\_repr\_\_ thing from NEWS
 * Revert the matcher change
 * NEWS tweaks
 * Use repr for showing matchers, rather than str
@@ -1446,7 +1467,7 @@
 * Fix many simple mistakes in the epytext
 * Add a 'make apidocs' target, and fix the docstrings with errors
 * Make the docs REST compliant
-* Change from using deepcopy to copy in testcase.clone_test_with_new_id
+* Change from using deepcopy to copy in testcase.clone\_test\_with\_new\_id
 * More docs on NotEquals
 * getUniqueString now takes an optional prefix
 * Amend docstring
@@ -1466,10 +1487,10 @@
 * Lots of little coding cleanups
 * Release is phony
 * Remove trailing whitespace
-* Change from using deepcopy to copy in testcase.clone_test_with_new_id
+* Change from using deepcopy to copy in testcase.clone\_test\_with\_new\_id
 * Monkeypatch deepcopy for python 2.4 to support copying function objects
-* Fix issue with test_stopTestRun_shows_details on windows
-* Fix test_now_datetime_now on win32 where time.time() returns the same value multiple times
+* Fix issue with test\_stopTestRun\_shows\_details on windows
+* Fix test\_now\_datetime\_now on win32 where time.time() returns the same value multiple times
 * Rephrase
 * Clarify
 * RELEASE!
@@ -1485,7 +1506,7 @@
 * Review feedback
 * Cleanup overall branch
 * Handle unicode tracebacks more gracefully
-* 3.1 compatible run_test.py
+* 3.1 compatible run\_test.py
 * Discard deepcopy approach, error rate is unacceptably high
 * Change copyright assignment policy as per jml
 * Reuse the standard library SkipTest exception when it is defined
@@ -1506,12 +1527,12 @@
 * don't store decoded value on traceback content
 * no reset() on real StringIO
 * Make TracebackContent suitable for py3k porting
-* fake hashing on _StringException
+* fake hashing on \_StringException
 * kill itervalues()
-* fix traceback Content and add a _b() fake literal
+* fix traceback Content and add a \_b() fake literal
 * replace iteritems
 * fix StringIO import on py3
-* add a _u function to imitate unicode literals on python3
+* add a \_u function to imitate unicode literals on python3
 * fix another except case
 * fix except syntax in test
 * handle Queue import
@@ -1536,7 +1557,7 @@
 * Tweak docs
 * Docs, and make exception handlers modifiable
 * More fully factored runtest
-* Teach _run_core to indicate if an exception was caught and processed
+* Teach \_run\_core to indicate if an exception was caught and processed
 * Consistent interface for handling exceptions in RunTest
 * RunTest.handlers fully implemented
 * Ensure KeyboardInterrupt isn't masked
@@ -1563,7 +1584,7 @@
 * Create a specific method to run the user code in a test
 * Add python 2.4 support for run() - untested
 * Move startTest/stopTest to RunTest
-* Better name for RunTest._run_decorated_result
+* Better name for RunTest.\_run\_decorated\_result
 * Move result decoration to RunTest
 * Move dynamic creation of test cases to RunTest
 * Start moving TestCase.run() logic to testtools.RunTest
@@ -1583,7 +1604,7 @@
 * Error if setUp or tearDown are not called
 * Compatible with python 2.7 at the TestResult layer
 * Project meta cleanups: setup.py executable, multiple committers in HACKING, NEWS file created
-* Start on 0.0.2: fix tests with python 2.6 (which defines __eq__)
+* Start on 0.0.2: fix tests with python 2.6 (which defines \_\_eq\_\_)
 * Compatibility with TestResult.startTestRun/stopTestRun
 * Compatibility with TestResult.startTestRun/stopTestRun
 * (statik) Add a manifest file so that LICENSE is included in the tarball generated by 'python setup.py sdist'
@@ -1612,11 +1633,11 @@
 * Tests for pyunit3k's TestResult extensions
 * Respond to review comments
 * Complete tests for MultiTestResult
-* Add tests for change_test_id, renaming to clone_test_with_new_id
+* Add tests for change\_test\_id, renaming to clone\_test\_with\_new\_id
 * Start tests for MultiTestResult
 * Some test factoring
-* Change change_test_id to clone_test_with_new_id
-* Add test for change_test_id, and modify change_test_id to do as the name implies
+* Change change\_test\_id to clone\_test\_with\_new\_id
+* Add test for change\_test\_id, and modify change\_test\_id to do as the name implies
 * Some tests for our TestResult extensions
 * Split pyunit3k into several modules
 * Last bit of splitting things up

_service:extract_file:testtools-2.3.0.tar.gz/NEWS -> _service:extract_file:testtools-2.4.0.tar.gz/NEWS Changed

@@ -3,6 +3,30 @@
 
 Changes and improvements to testtools_, grouped by release.
 
+2.4.0
+~~~~~
+
+Improvements
+------------
+
+* Add support for Python 3.7, 3.8 and PyPy3.
+  (Hugo van Kemenade)
+
+* Drop support for Python 3.4 (EOL).
+  (Jelmer Vernooĳ)
+
+* Avoid using eval(). (Ross Burton)
+
+* PyCharm IDE unittest detection compatibility fix.
+  (Adam Harwell)
+
+* Drop support for Python 3.3 (EOL).
+  (Robert Collins)
+
+* Spelling fixes. (Free Ekanayaka)
+
+* Python 3.6 invalid escape sequence deprecation fixes. (Ville Skyttä)
+
 2.3.0
 ~~~~~
 
@@ -104,7 +128,7 @@
 * ``MatchesListwise`` has more informative error when lengths don't match.
   (Jonathan Lange)
 
-* The short form of errors for failed binary comparisions will now put the
+* The short form of errors for failed binary comparisons will now put the
   expected value on the _right_. This means that ``assertThat(2, Equals(3))``
   will raise an error saying ``2 != 3``.
   (Jonathan Lange, #1525227)
@@ -274,7 +298,7 @@
   our exception lookup priorities to support it. Regular skips done through
   raise self.skipException will continue to work, since they were always caught
   in our code - its because the suite type being used to implement setUpClass
-  has changed that an issue occured.
+  has changed that an issue occurred.
   (Robert Collins, #1393068)
 
 1.2.1
@@ -295,7 +319,7 @@
 * Depends on unittest2 for discovery functionality and the ``TestProgram`` base
   class. This brings in many fixes made to discovery where previously we were
   only using the discovery package or the version in the release of Python
-  that the test execution was occuring on. (Robert Collins, #1271133)
+  that the test execution was occurring on. (Robert Collins, #1271133)
 
 * Fixed unit tests which were failing under pypy due to a change in the way
   pypy formats tracebacks. (Thomi Richards)

_service:extract_file:testtools-2.3.0.tar.gz/PKG-INFO -> _service:extract_file:testtools-2.4.0.tar.gz/PKG-INFO Changed

@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
 Name: testtools
-Version: 2.3.0
+Version: 2.4.0
 Summary: Extensions to the Python standard library unit testing framework
 Home-page: https://github.com/testing-cabal/testtools
 Author: Jonathan M. Lange
@@ -100,7 +100,7 @@
         --------------------------
         
         testtools gives you the very latest in unit testing technology in a way that
-        will work with Python 2.7, 3.3, 3.4, 3.5, and pypy.
+        will work with Python 2.7, 3.4+, and pypy.
         
         If you wish to use testtools with Python 2.4 or 2.5, then please use testtools
         0.9.15.
@@ -108,7 +108,26 @@
         If you wish to use testtools with Python 2.6 or 3.2, then please use testtools
         1.9.0.
         
+        If you wish to use testtools with Python 3.3, then please use testtools 2.3.0.
+        
         
 Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Testing
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
+Provides-Extra: test

_service:extract_file:testtools-2.3.0.tar.gz/README.rst -> _service:extract_file:testtools-2.4.0.tar.gz/README.rst Changed

@@ -31,7 +31,7 @@
 Supported platforms
 -------------------
 
- * Python 2.7+ or 3.3+ / pypy (2.x+)
+ * Python 2.7 or 3.5+ / PyPy
 
 If you would like to use testtools for earlier Pythons, please use testtools
 1.9.0, or for *really* old Pythons, testtools 0.9.15.
@@ -46,7 +46,7 @@
 If you would like to use our Twisted support, then you will need Twisted.
 
 If you want to use ``fixtures`` then you can either install fixtures (e.g. from
-https://launchpad.net/python-fixtures or http://pypi.python.org/pypi/fixtures)
+https://launchpad.net/python-fixtures or https://pypi.python.org/pypi/fixtures)
 or alternatively just make sure your fixture objects obey the same protocol.
 
 
@@ -54,7 +54,7 @@
 -----------------------
 
 Please report bugs using Launchpad at <https://bugs.launchpad.net/testtools>.
-Patches should be submitted as Github pull requests, or mailed to the authors.
+Patches should be submitted as GitHub pull requests, or mailed to the authors.
 See ``doc/hacking.rst`` for more details.
 
 There's no mailing list for this project yet, however the testing-in-python
@@ -93,3 +93,5 @@
  * ClusterHQ Ltd
  * Tristan Seligmann
  * Jonathan Jacobs
+ * Jelmer Vernooĳ
+ * Hugo van Kemenade
\ No newline at end of file

_service:extract_file:testtools-2.3.0.tar.gz/doc/for-framework-folk.rst -> _service:extract_file:testtools-2.4.0.tar.gz/doc/for-framework-folk.rst Changed

_service:extract_file:testtools-2.3.0.tar.gz/doc/hacking.rst -> _service:extract_file:testtools-2.4.0.tar.gz/doc/hacking.rst Changed

_service:extract_file:testtools-2.3.0.tar.gz/doc/overview.rst -> _service:extract_file:testtools-2.4.0.tar.gz/doc/overview.rst Changed

_service:extract_file:testtools-2.3.0.tar.gz/scripts/all-pythons -> _service:extract_file:testtools-2.4.0.tar.gz/scripts/all-pythons Changed

_service:extract_file:testtools-2.3.0.tar.gz/setup.cfg -> _service:extract_file:testtools-2.4.0.tar.gz/setup.cfg Changed

_service:extract_file:testtools-2.3.0.tar.gz/setup.py -> _service:extract_file:testtools-2.4.0.tar.gz/setup.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools.egg-info/PKG-INFO -> _service:extract_file:testtools-2.4.0.tar.gz/testtools.egg-info/PKG-INFO Changed

@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
 Name: testtools
-Version: 2.3.0
+Version: 2.4.0
 Summary: Extensions to the Python standard library unit testing framework
 Home-page: https://github.com/testing-cabal/testtools
 Author: Jonathan M. Lange
@@ -100,7 +100,7 @@
         --------------------------
         
         testtools gives you the very latest in unit testing technology in a way that
-        will work with Python 2.7, 3.3, 3.4, 3.5, and pypy.
+        will work with Python 2.7, 3.4+, and pypy.
         
         If you wish to use testtools with Python 2.4 or 2.5, then please use testtools
         0.9.15.
@@ -108,7 +108,26 @@
         If you wish to use testtools with Python 2.6 or 3.2, then please use testtools
         1.9.0.
         
+        If you wish to use testtools with Python 3.3, then please use testtools 2.3.0.
+        
         
 Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Testing
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
+Provides-Extra: test

_service:extract_file:testtools-2.3.0.tar.gz/testtools.egg-info/pbr.json -> _service:extract_file:testtools-2.4.0.tar.gz/testtools.egg-info/pbr.json Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools.egg-info/requires.txt -> _service:extract_file:testtools-2.4.0.tar.gz/testtools.egg-info/requires.txt Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/assertions.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/assertions.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/content.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/content.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/matchers/_exception.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/matchers/_exception.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/matchers/_warnings.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/matchers/_warnings.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/testcase.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/testcase.py Changed

@@ -25,10 +25,14 @@
 from extras import (
     safe_hasattr,
     try_import,
-    try_imports,
     )
 # To let setup.py work, make this a conditional import.
-unittest = try_imports('unittest2', 'unittest')
+# Don't use extras.try_imports, as it interferes with PyCharm's unittest
+# detection algorithm. See: https://youtrack.jetbrains.com/issue/PY-26630
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 import six
 
 from testtools import (
@@ -82,7 +86,7 @@
 
 
 class _ExpectedFailure(Exception):
-    """An expected failure occured.
+    """An expected failure occurred.
 
     Note that this exception is private plumbing in testtools' testcase
     module.
@@ -391,7 +395,7 @@
         the exception has caused.
 
         Handlers are called in first-added, first-called order, and if they
-        raise an exception, that will propogate out of the test running
+        raise an exception, that will propagate out of the test running
         machinery, halting test processing. As a result, do not call code that
         may unreasonably fail.
         """

_service:extract_file:testtools-2.3.0.tar.gz/testtools/testresult/real.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/testresult/real.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/tests/matchers/test_basic.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/tests/matchers/test_basic.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/tests/matchers/test_datastructures.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/tests/matchers/test_datastructures.py Changed

@@ -150,27 +150,27 @@
         self.assertMismatchWithDescriptionMatching(
             3, MatchesSetwise(Equals(1), Equals(2), Equals(3)),
             MatchesRegex(
-                'There were 2 matchers left over: Equals$12$, '
-                'Equals$12$'))
+                r'There were 2 matchers left over: Equals$12$, '
+                r'Equals$12$'))
 
     def test_two_too_many_values(self):
         self.assertMismatchWithDescriptionMatching(
             1, 2, 3, 4, MatchesSetwise(Equals(1), Equals(2)),
             MatchesRegex(
-                'There were 2 values left over: \34, 34\'))
+                r'There were 2 values left over: \34, 34\'))
 
     def test_mismatch_and_too_many_matchers(self):
         self.assertMismatchWithDescriptionMatching(
             2, 3, MatchesSetwise(Equals(0), Equals(1), Equals(2)),
             MatchesRegex(
-                '.*There was 1 mismatch and 1 extra matcher: Equals$01$',
+                r'.*There was 1 mismatch and 1 extra matcher: Equals$01$',
                 re.S))
 
     def test_mismatch_and_too_many_values(self):
         self.assertMismatchWithDescriptionMatching(
             2, 3, 4, MatchesSetwise(Equals(1), Equals(2)),
             MatchesRegex(
-                '.*There was 1 mismatch and 1 extra value: \34\',
+                r'.*There was 1 mismatch and 1 extra value: \34\',
                 re.S))
 
     def test_mismatch_and_two_too_many_matchers(self):
@@ -179,13 +179,13 @@
                 Equals(0), Equals(1), Equals(2), Equals(3)),
             MatchesRegex(
                 '.*There was 1 mismatch and 2 extra matchers: '
-                'Equals$012$, Equals$012$', re.S))
+                r'Equals$012$, Equals$012$', re.S))
 
     def test_mismatch_and_two_too_many_values(self):
         self.assertMismatchWithDescriptionMatching(
             2, 3, 4, 5, MatchesSetwise(Equals(1), Equals(2)),
             MatchesRegex(
-                '.*There was 1 mismatch and 2 extra values: \145, 145\',
+                r'.*There was 1 mismatch and 2 extra values: \145, 145\',
                 re.S))

_service:extract_file:testtools-2.3.0.tar.gz/testtools/tests/matchers/test_exception.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/tests/matchers/test_exception.py Changed

@@ -32,15 +32,22 @@
     matches_matches = error_foo
     matches_mismatches = error_bar, error_base_foo
 
+    if sys.version_info >= (3, 7):
+        # exception's repr has changed
+        _e = ''
+    else:
+        _e = ','
+
     str_examples = 
-        ("MatchesException(Exception('foo',))",
+        ("MatchesException(Exception('foo'%s))" % _e,
          MatchesException(Exception('foo')))
         
     describe_examples = 
         ("%r is not a %r" % (Exception, ValueError),
          error_base_foo,
          MatchesException(ValueError("foo"))),
-        ("ValueError('bar',) has different arguments to ValueError('foo',).",
+        ("ValueError('bar'%s) has different arguments to ValueError('foo'%s)."
+         % (_e, _e),
          error_bar,
          MatchesException(ValueError("foo"))),
         
@@ -150,17 +157,17 @@
         matcher = Raises(MatchesException(KeyboardInterrupt))
         self.assertThat(self.raiser, matcher)
 
-    def test_KeyboardInterrupt_propogates(self):
-        # The default 'it raised' propogates KeyboardInterrupt.
+    def test_KeyboardInterrupt_propagates(self):
+        # The default 'it raised' propagates KeyboardInterrupt.
         match_keyb = Raises(MatchesException(KeyboardInterrupt))
         def raise_keyb_from_match():
             matcher = Raises()
             matcher.match(self.raiser)
         self.assertThat(raise_keyb_from_match, match_keyb)
 
-    def test_KeyboardInterrupt_match_Exception_propogates(self):
+    def test_KeyboardInterrupt_match_Exception_propagates(self):
         # If the raised exception isn't matched, and it is not a subclass of
-        # Exception, it is propogated.
+        # Exception, it is propagated.
         match_keyb = Raises(MatchesException(KeyboardInterrupt))
         def raise_keyb_from_match():
             matcher = Raises(MatchesException(Exception))

_service:extract_file:testtools-2.3.0.tar.gz/testtools/tests/test_compat.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/tests/test_compat.py Changed

@@ -2,6 +2,7 @@
 
 """Tests for miscellaneous compatibility functions"""
 
+import ast
 import io
 import linecache2 as linecache
 import os
@@ -198,28 +199,28 @@
             actual = text_repr(b, multiline=False)
             # Add self.assertIsInstance check?
             self.assertEqual(actual, self.b_prefix + expected)
-            self.assertEqual(eval(actual), b)
+            self.assertEqual(ast.literal_eval(actual), b)
 
     def test_ascii_examples_oneline_unicode(self):
         for s, expected, _ in self.ascii_examples:
             u = _u(s)
             actual = text_repr(u, multiline=False)
             self.assertEqual(actual, self.u_prefix + expected)
-            self.assertEqual(eval(actual), u)
+            self.assertEqual(ast.literal_eval(actual), u)
 
     def test_ascii_examples_multiline_bytes(self):
         for s, _, expected in self.ascii_examples:
             b = _b(s)
             actual = text_repr(b, multiline=True)
             self.assertEqual(actual, self.b_prefix + expected)
-            self.assertEqual(eval(actual), b)
+            self.assertEqual(ast.literal_eval(actual), b)
 
     def test_ascii_examples_multiline_unicode(self):
         for s, _, expected in self.ascii_examples:
             u = _u(s)
             actual = text_repr(u, multiline=True)
             self.assertEqual(actual, self.u_prefix + expected)
-            self.assertEqual(eval(actual), u)
+            self.assertEqual(ast.literal_eval(actual), u)
 
     def test_ascii_examples_defaultline_bytes(self):
         for s, one, multi in self.ascii_examples:
@@ -235,25 +236,25 @@
         for b, expected, _ in self.bytes_examples:
             actual = text_repr(b, multiline=False)
             self.assertEqual(actual, self.b_prefix + expected)
-            self.assertEqual(eval(actual), b)
+            self.assertEqual(ast.literal_eval(actual), b)
 
     def test_bytes_examples_multiline(self):
         for b, _, expected in self.bytes_examples:
             actual = text_repr(b, multiline=True)
             self.assertEqual(actual, self.b_prefix + expected)
-            self.assertEqual(eval(actual), b)
+            self.assertEqual(ast.literal_eval(actual), b)
 
     def test_unicode_examples_oneline(self):
         for u, expected, _ in self.unicode_examples:
             actual = text_repr(u, multiline=False)
             self.assertEqual(actual, self.u_prefix + expected)
-            self.assertEqual(eval(actual), u)
+            self.assertEqual(ast.literal_eval(actual), u)
 
     def test_unicode_examples_multiline(self):
         for u, _, expected in self.unicode_examples:
             actual = text_repr(u, multiline=True)
             self.assertEqual(actual, self.u_prefix + expected)
-            self.assertEqual(eval(actual), u)
+            self.assertEqual(ast.literal_eval(actual), u)

_service:extract_file:testtools-2.3.0.tar.gz/testtools/tests/test_testcase.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/tests/test_testcase.py Changed

@@ -389,14 +389,14 @@
     def test_assertRaisesRegexp(self):
         # assertRaisesRegexp asserts that function raises particular exception
         # with particular message.
-        self.assertRaisesRegexp(RuntimeError, "M\w*e", self.raiseError,
+        self.assertRaisesRegexp(RuntimeError, r"M\w*e", self.raiseError,
                                 RuntimeError, "Message")
 
     def test_assertRaisesRegexp_wrong_error_type(self):
         # If function raises an exception of unexpected type,
         # assertRaisesRegexp re-raises it.
         self.assertRaises(ValueError, self.assertRaisesRegexp, RuntimeError,
-                          "M\w*e", self.raiseError, ValueError, "Message")
+                          r"M\w*e", self.raiseError, ValueError, "Message")
 
     def test_assertRaisesRegexp_wrong_message(self):
         # If function raises an exception with unexpected message
@@ -1095,7 +1095,6 @@
         self.assertDetailsProvided(case, "addUnexpectedSuccess",
             "foo", "reason")
 
-    @skipIf(not hasattr(unittest, 'expectedFailure'), 'Need py27+')
     def test_unittest_expectedFailure_decorator_works_with_failure(self):
         class ReferenceTest(TestCase):
             @unittest.expectedFailure
@@ -1106,7 +1105,6 @@
         result = test.run()
         self.assertEqual(True, result.wasSuccessful())
 
-    @skipIf(not hasattr(unittest, 'expectedFailure'), 'Need py27+')
     def test_unittest_expectedFailure_decorator_works_with_success(self):
         class ReferenceTest(TestCase):
             @unittest.expectedFailure
@@ -1450,12 +1448,6 @@
             second_result._events, self.expected_second_result)
 
 
-require_py27_minimum = skipIf(
-    sys.version < '2.7',
-    "Requires python 2.7 or greater"
-)
-
-
 class TestSkipping(TestCase):
     """Tests for skipping of tests functionality."""
 
@@ -1635,7 +1627,6 @@
             reason
         )
 
-    @require_py27_minimum
     def test_unittest_skip_decorator_does_not_run_setUp(self):
         reason = self.getUniqueString()
         self.check_skip_decorator_does_not_run_setup(
@@ -1643,7 +1634,6 @@
             reason
         )
 
-    @require_py27_minimum
     def test_unittest_skipIf_decorator_does_not_run_setUp(self):
         reason = self.getUniqueString()
         self.check_skip_decorator_does_not_run_setup(
@@ -1651,7 +1641,6 @@
             reason
         )
 
-    @require_py27_minimum
     def test_unittest_skipUnless_decorator_does_not_run_setUp(self):
         reason = self.getUniqueString()
         self.check_skip_decorator_does_not_run_setup(

_service:extract_file:testtools-2.3.0.tar.gz/testtools/tests/test_testresult.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/tests/test_testresult.py Changed

@@ -9,6 +9,7 @@
 import doctest
 from itertools import chain, combinations
 import os
+import platform
 import re
 import shutil
 import sys
@@ -2530,13 +2531,13 @@
 
     def _test_external_case(self, testline, coding="ascii", modulelevel="",
             suffix=""):
-        """Create and run a test case in a seperate module"""
+        """Create and run a test case in a separate module"""
         self._setup_external_case(testline, coding, modulelevel, suffix)
         return self._run_external_case()
 
     def _setup_external_case(self, testline, coding="ascii", modulelevel="",
             suffix=""):
-        """Create a test case in a seperate module"""
+        """Create a test case in a separate module"""
         _, prefix, self.modname = self.id().rsplit(".", 2)
         self.dir = tempfile.mkdtemp(prefix=prefix, suffix=suffix)
         self.addCleanup(shutil.rmtree, self.dir)
@@ -2552,7 +2553,7 @@
             "        %s\n" % (coding, modulelevel, testline))
 
     def _run_external_case(self):
-        """Run the prepared test case in a seperate module"""
+        """Run the prepared test case in a separate module"""
         sys.path.insert(0, self.dir)
         self.addCleanup(sys.path.remove, self.dir)
         module = __import__(self.modname)
@@ -2599,7 +2600,7 @@
         self.assertIn(self._as_output(_u("\uFFFD\uFFFD\uFFFD")), textoutput)
 
     def _local_os_error_matcher(self):
-        if sys.version_info > (3, 3):
+        if sys.version_info > (3, 4):
             return MatchesAny(Contains("FileExistsError: "),
                               Contains("PermissionError: "))
         elif os.name != "nt":
@@ -2678,12 +2679,16 @@
 
     def test_syntax_error(self):
         """Syntax errors should still have fancy special-case formatting"""
+        if platform.python_implementation() == "PyPy":
+            spaces = '           '
+        else:
+            spaces = '          '
         textoutput = self._test_external_case("exec ('f(a, b c)')")
         self.assertIn(self._as_output(
             '  File "<string>", line 1\n'
             '    f(a, b c)\n'
             + ' ' * self._error_on_character +
-            '          ^\n'
+            spaces + '^\n'
             'SyntaxError: '
             ), textoutput)

_service:extract_file:testtools-2.3.0.tar.gz/testtools/testsuite.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/testsuite.py Changed

@@ -10,6 +10,7 @@
     'sorted_tests',
 
 
+from collections import Counter
 from pprint import pformat
 import sys
 import threading
@@ -250,7 +251,7 @@
         fails the predicate when it will return a new unittest.TestSuite with
         no contents.
 
-    This helper exists to provide backwards compatability with older versions
+    This helper exists to provide backwards compatibility with older versions
     of Python (currently all versions :)) that don't have a native
     filter_by_ids() method on Test(Case|Suite).
 
@@ -267,10 +268,10 @@
 
     For anything else, it is not filtered - it is returned as-is.
 
-    To provide compatability with this routine for a custom TestSuite, just
+    To provide compatibility with this routine for a custom TestSuite, just
     define a filter_by_ids() method that will return a TestSuite equivalent to
     the original minus any tests not in test_ids.
-    Similarly to provide compatability for a custom TestCase that does
+    Similarly to provide compatibility for a custom TestCase that does
     something unusual define filter_by_ids to return a new TestCase object
     that will only run test_ids that are in the provided container. If none
     would run, return an empty TestSuite().
@@ -301,21 +302,11 @@
     return suite_or_case
 
 
-# XXX: Python 2.6. Replace this with Counter when we drop 2.6 support.
-def _counter(xs):
-    """Return a dict mapping values of xs to number of times they appear."""
-    counts = {}
-    for x in xs:
-        times = counts.setdefault(x, 0)
-        countsx = times + 1
-    return counts
-
-
 def sorted_tests(suite_or_case, unpack_outer=False):
     """Sort suite_or_case while preserving non-vanilla TestSuites."""
     # Duplicate test id can induce TypeError in Python 3.3.
     # Detect the duplicate test ids, raise exception when found.
-    seen = _counter(case.id() for case in iterate_tests(suite_or_case))
+    seen = Counter(case.id() for case in iterate_tests(suite_or_case))
     duplicates = dict(
         (test_id, count) for test_id, count in seen.items() if count > 1)
     if duplicates:

_service:tar_scm:python-testtools-1597144135.2019412.tar Deleted

_service:tar_scm:python-testtools-1650770150.f780d95.tar Added

Changes of Revision 2