[Pytest-commit] commit/pytest: hpk42: Merged in tomviner/pytest/some_spelling_fixes (pull request #224)

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Tue Oct 14 09:59:55 CEST 2014


1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/cb1ab2ce0f47/
Changeset:   cb1ab2ce0f47
User:        hpk42
Date:        2014-10-14 07:59:49+00:00
Summary:     Merged in tomviner/pytest/some_spelling_fixes (pull request #224)

A few spelling fixes
Affected #:  8 files

diff -r b661b59125202291e8d01272eafd71dc7ea2d8ab -r cb1ab2ce0f47d7ce77ccf3e2c2caa52e1e729e2f CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -428,7 +428,7 @@
 
 - introduce node.get_marker/node.add_marker API for plugins
   like pytest-pep8 and pytest-flakes to avoid the messy
-  details of the node.keywords  pseudo-dicts.  Adapated
+  details of the node.keywords  pseudo-dicts.  Adapted
   docs.
 
 - remove attempt to "dup" stdout at startup as it's icky.
@@ -495,7 +495,7 @@
   as strings will remain fully supported.
 
 - reporting: color the last line red or green depending if
-  failures/errors occured or everything passed.  thanks Christian
+  failures/errors occurred or everything passed.  thanks Christian
   Theunert.
 
 - make "import pdb ; pdb.set_trace()" work natively wrt capturing (no

diff -r b661b59125202291e8d01272eafd71dc7ea2d8ab -r cb1ab2ce0f47d7ce77ccf3e2c2caa52e1e729e2f ISSUES.txt
--- a/ISSUES.txt
+++ b/ISSUES.txt
@@ -49,7 +49,7 @@
 the marker-mechanism with respect to a test module but puts it to a directory
 scale.
 
-When doing larger scoped parametrization it probably becomes neccessary 
+When doing larger scoped parametrization it probably becomes necessary
 to allow parametrization to be ignored if the according parameter is not
 used (currently any parametrized argument that is not present in a function will cause a ValueError). Example:
 
@@ -77,7 +77,7 @@
 different values for self.db. This could also work with unittest/nose
 style tests, i.e. it leverages existing test suites without needing
 to rewrite them. Together with the previously mentioned setup_test()
-maybe the setupfunc could be ommitted?
+maybe the setupfunc could be omitted?
 
 optimizations 
 ---------------------------------------------------------------
@@ -229,7 +229,7 @@
 
 pytest.ensuretemp and pytest.config are probably the last
 objects containing global state.  Often using them is not
-neccessary.  This is about trying to get rid of them, i.e.
+necessary.  This is about trying to get rid of them, i.e.
 deprecating them and checking with PyPy's usages as well
 as others.
 
@@ -298,7 +298,7 @@
 
 The idea is that you can e.g. import modules in a test and afterwards
 sys.modules, sys.meta_path etc would be reverted.  It can go further
-then just importing however, e.g. current working direcroty, file
+then just importing however, e.g. current working directory, file
 descriptors, ...
 
 This would probably be done by marking::
@@ -357,7 +357,7 @@
             id, call = prepare_check(check)
             # bubble should only prevent exception propagation after a failure
             # the whole test should still fail
-            # there might be need for a loer level api and taking custom markers into account
+            # there might be need for a lower level api and taking custom markers into account
             with pytest.section(id, bubble=False):
                 call()
 

diff -r b661b59125202291e8d01272eafd71dc7ea2d8ab -r cb1ab2ce0f47d7ce77ccf3e2c2caa52e1e729e2f _pytest/assertion/rewrite.py
--- a/_pytest/assertion/rewrite.py
+++ b/_pytest/assertion/rewrite.py
@@ -455,7 +455,7 @@
     for an overview of how this works.
 
     The entry point here is .run() which will iterate over all the
-    statenemts in an ast.Module and for each ast.Assert statement it
+    statements in an ast.Module and for each ast.Assert statement it
     finds call .visit() with it.  Then .visit_Assert() takes over and
     is responsible for creating new ast statements to replace the
     original assert statement: it re-writes the test of an assertion

diff -r b661b59125202291e8d01272eafd71dc7ea2d8ab -r cb1ab2ce0f47d7ce77ccf3e2c2caa52e1e729e2f doc/en/announce/release-2.4.0.txt
--- a/doc/en/announce/release-2.4.0.txt
+++ b/doc/en/announce/release-2.4.0.txt
@@ -34,7 +34,7 @@
   influence the environment before conftest files import ``django``.
 
 - reporting: color the last line red or green depending if
-  failures/errors occured or everything passed.
+  failures/errors occurred or everything passed.
 
 The documentation has been updated to accomodate the changes, 
 see `http://pytest.org <http://pytest.org>`_ 
@@ -95,7 +95,7 @@
   as strings will remain fully supported.
 
 - reporting: color the last line red or green depending if
-  failures/errors occured or everything passed.  thanks Christian
+  failures/errors occurred or everything passed.  thanks Christian
   Theunert.
 
 - make "import pdb ; pdb.set_trace()" work natively wrt capturing (no

diff -r b661b59125202291e8d01272eafd71dc7ea2d8ab -r cb1ab2ce0f47d7ce77ccf3e2c2caa52e1e729e2f doc/en/announce/release-2.4.2.txt
--- a/doc/en/announce/release-2.4.2.txt
+++ b/doc/en/announce/release-2.4.2.txt
@@ -21,7 +21,7 @@
 
 - introduce node.get_marker/node.add_marker API for plugins
   like pytest-pep8 and pytest-flakes to avoid the messy
-  details of the node.keywords  pseudo-dicts.  Adapated
+  details of the node.keywords  pseudo-dicts.  Adapted
   docs.
 
 - remove attempt to "dup" stdout at startup as it's icky.

diff -r b661b59125202291e8d01272eafd71dc7ea2d8ab -r cb1ab2ce0f47d7ce77ccf3e2c2caa52e1e729e2f doc/en/index.txt
--- a/doc/en/index.txt
+++ b/doc/en/index.txt
@@ -31,7 +31,7 @@
 **scales from simple unit to complex functional testing**
 
  - :ref:`modular parametrizeable fixtures <fixture>` (new in 2.3,
-   continously improved)
+   continuously improved)
  - :ref:`parametrized test functions <parametrized test functions>`
  - :ref:`mark`
  - :ref:`skipping` (improved in 2.4)

diff -r b661b59125202291e8d01272eafd71dc7ea2d8ab -r cb1ab2ce0f47d7ce77ccf3e2c2caa52e1e729e2f doc/en/monkeypatch.txt
--- a/doc/en/monkeypatch.txt
+++ b/doc/en/monkeypatch.txt
@@ -57,7 +57,7 @@
 example: setting an attribute on some class
 ------------------------------------------------------
 
-If you need to patch out ``os.getcwd()`` to return an artifical
+If you need to patch out ``os.getcwd()`` to return an artificial
 value::
 
     def test_some_interaction(monkeypatch):

diff -r b661b59125202291e8d01272eafd71dc7ea2d8ab -r cb1ab2ce0f47d7ce77ccf3e2c2caa52e1e729e2f doc/en/projects.txt
--- a/doc/en/projects.txt
+++ b/doc/en/projects.txt
@@ -78,6 +78,6 @@
 * `Stups department of Heinrich Heine University Duesseldorf <http://www.stups.uni-duesseldorf.de/projects.php>`_
 * `cellzome <http://www.cellzome.com/>`_
 * `Open End, Gothenborg <http://www.openend.se>`_
-* `Laboraratory of Bioinformatics, Warsaw <http://genesilico.pl/>`_
+* `Laboratory of Bioinformatics, Warsaw <http://genesilico.pl/>`_
 * `merlinux, Germany <http://merlinux.eu>`_
 * many more ... (please be so kind to send a note via :ref:`contact`)

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.


More information about the pytest-commit mailing list