[Pytest-commit] commit/pytest: hpk42: fix issue407: fix addoption docstring to point to argparse instead of

[commits-noreply at bitbucket.org]

1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/5e1b7d9dc655/
Changeset:   5e1b7d9dc655
User:        hpk42
Date:        2013-12-16 18:07:05
Summary:     fix issue407: fix addoption docstring to point to argparse instead of
optparse. Thanks Daniel D. Wright.
Affected #:  4 files

diff -r 2cd7288ce1ffadcda7c96502fb165e3fa2d33006 -r 5e1b7d9dc6555bbc576d5fb85a67c4421896f262 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,10 @@
 - fix issue404 by always using the binary xml escape in the junitxml
   plugin.  Thanks Ronny Pfannschmidt.
 
+- fix issue407: fix addoption docstring to point to argparse instead of
+  optparse. Thanks Daniel D. Wright.
+
+
 2.5.0
 -----------------------------------
 

diff -r 2cd7288ce1ffadcda7c96502fb165e3fa2d33006 -r 5e1b7d9dc6555bbc576d5fb85a67c4421896f262 _pytest/__init__.py
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.5.0'
+__version__ = '2.5.1'

diff -r 2cd7288ce1ffadcda7c96502fb165e3fa2d33006 -r 5e1b7d9dc6555bbc576d5fb85a67c4421896f262 _pytest/config.py
--- a/_pytest/config.py
+++ b/_pytest/config.py
@@ -128,8 +128,8 @@
 
         :opts: option names, can be short or long options.
         :attrs: same attributes which the ``add_option()`` function of the
-           `optparse library
-           <http://docs.python.org/library/optparse.html#module-optparse>`_
+           `argparse library
+           <http://docs.python.org/2/library/argparse.html>`_
            accepts.
 
         After command line parsing options are available on the pytest config

diff -r 2cd7288ce1ffadcda7c96502fb165e3fa2d33006 -r 5e1b7d9dc6555bbc576d5fb85a67c4421896f262 setup.py
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.5.0',
+        version='2.5.1',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],

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.