Merged devel into default for release 0.8.1 of plac

3 files changed, 5 insertions, 3 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index a148668..a3a17f7 100644
--- a/CHANGES.txt
+++ b/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/documentation3.py b/documentation3.py
index c737267..d45d065 100644
--- a/documentation3.py
+++ b/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 "<string>", line 2, in f
@@ -678,7 +678,7 @@ function is decorated the traceback will be longer:
         return f(*args, **kw)
       File "<doctest __main__[51]>", 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 "<string>", line 2, in f``. 
diff --git a/src/decorator.py b/src/decorator.py
index a7815ab..d9fb01e 100644
--- a/src/decorator.py
+++ b/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"]