From 5635409a212680bdd4965806bb73f38c0557513c Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Mon, 11 Apr 2011 09:58:43 +0200 Subject: Fixed a doctest broken in Python 3.2 --- decorator/CHANGES.txt | 2 ++ decorator/documentation3.py | 4 ++-- decorator/src/decorator.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/decorator/CHANGES.txt b/decorator/CHANGES.txt index a148668..a3a17f7 100644 --- a/decorator/CHANGES.txt +++ b/decorator/CHANGES.txt @@ -1,6 +1,8 @@ HISTORY ---------- +3.3.1 Fixed a doctest broken for Python 3.2, as noted by + Arfrever Frehtes Taifersar Arahesis (11/04/2011) 3.3. Added support for function annotations (1/1/2011) 3.2.1. Now the .func_globals of the decorated function are the same of the undecorated function, as requested by Paul Ollis (28/12/2010) diff --git a/decorator/documentation3.py b/decorator/documentation3.py index c737267..d45d065 100644 --- a/decorator/documentation3.py +++ b/decorator/documentation3.py @@ -670,7 +670,7 @@ function is decorated the traceback will be longer: .. code-block:: python - >>> f() + >>> f() # doctest: +ELLIPSIS Traceback (most recent call last): ... File "", line 2, in f @@ -678,7 +678,7 @@ function is decorated the traceback will be longer: return f(*args, **kw) File "", line 3, in f 1/0 - ZeroDivisionError: int division or modulo by zero + ZeroDivisionError: ... You see here the inner call to the decorator ``trace``, which calls ``f(*args, **kw)``, and a reference to ``File "", line 2, in f``. diff --git a/decorator/src/decorator.py b/decorator/src/decorator.py index a7815ab..d9fb01e 100644 --- a/decorator/src/decorator.py +++ b/decorator/src/decorator.py @@ -28,7 +28,7 @@ Decorator module, see http://pypi.python.org/pypi/decorator for the documentation. """ -__version__ = '3.3.0' +__version__ = '3.3.1' __all__ = ["decorator", "FunctionMaker", "partial"] -- cgit v1.2.1