Merge pull request #6 from micheles/3.4.2

3.4.2

10 files changed, 103 insertions, 102 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 5595fb6..212cc47 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
 HISTORY
 ----------
 
+3.4.2 Same as 3.4.1, re-uploaded to PyPI (2015-03-22)
 3.4.1 Ported the repository from GoogleCode to GitHub and added Travis CI
      support. Tests are executed with the new command `python test.py -v`.
      setuptools is now mandatory in Python 3. The suggested
diff --git a/README.rst b/README.rst
index 0e4916a..2dc5b5b 100644
--- a/README.rst
+++ b/README.rst
@@ -60,10 +60,10 @@ There are various versions of the documentation:
 -  `HTML version (Python 3)`_ 

 -  `PDF version (Python 3)`_ 

 

-.. _HTML version (Python 2): https://github.com/micheles/decorator/blob/3.4.1/documentation.rst

-.. _PDF version (Python 2): https://github.com/micheles/decorator/blob/3.4.1/documentation.pdf

-.. _HTML version (Python 3): https://github.com/micheles/decorator/blob/3.4.1/documentation3.rst

-.. _PDF version (Python 3): https://github.com/micheles/decorator/blob/3.4.1/documentation3.pdf

+.. _HTML version (Python 2): https://github.com/micheles/decorator/blob/3.4.2/documentation.rst

+.. _PDF version (Python 2): https://github.com/micheles/decorator/blob/3.4.2/documentation.pdf

+.. _HTML version (Python 3): https://github.com/micheles/decorator/blob/3.4.2/documentation3.rst

+.. _PDF version (Python 3): https://github.com/micheles/decorator/blob/3.4.2/documentation3.pdf

 

 Repository

 ---------------

diff --git a/documentation.pdf b/documentation.pdf
index 9955da4..92d5ad9 100644
--- a/documentation.pdf
+++ b/documentation.pdf
@@ -16,7 +16,7 @@ endobj
 << /A << /S /URI /Type /Action /URI (mailto:michele.simionato@gmail.com) >> /Border [ 0 0 0 ] /Rect [ 153.7323 704.7736 289.4623 716.7736 ] /Subtype /Link /Type /Annot >>

 endobj

 6 0 obj

-<< /A << /S /URI /Type /Action /URI (http://pypi.python.org/pypi/decorator/3.4.1) >> /Border [ 0 0 0 ] /Rect [ 153.7323 659.7736 526.5827 671.7736 ] /Subtype /Link /Type /Annot >>

+<< /A << /S /URI /Type /Action /URI (http://pypi.python.org/pypi/decorator/3.4.2) >> /Border [ 0 0 0 ] /Rect [ 153.7323 659.7736 526.5827 671.7736 ] /Subtype /Link /Type /Annot >>

 endobj

 7 0 obj

 << /BaseFont /Courier /Encoding /WinAnsiEncoding /Name /F4 /Subtype /Type1 /Type /Font >>

@@ -217,7 +217,7 @@ endobj
 << /Outlines 68 0 R /PageLabels 100 0 R /PageMode /UseNone /Pages 84 0 R /Type /Catalog >>

 endobj

 67 0 obj

-<< /Author (Michele Simionato) /CreationDate (D:20150316162015-01'00') /Creator (\(unspecified\)) /Keywords () /Producer (ReportLab PDF Library - www.reportlab.com) /Subject (\(unspecified\)) 

+<< /Author (Michele Simionato) /CreationDate (D:20150317194850-01'00') /Creator (\(unspecified\)) /Keywords () /Producer (ReportLab PDF Library - www.reportlab.com) /Subject (\(unspecified\)) 

   /Title (The decorator module) >>

 endobj

 68 0 obj

@@ -273,7 +273,7 @@ endobj
   59 0 R 60 0 R 61 0 R 63 0 R 65 0 R ] /Type /Pages >>

 endobj

 85 0 obj

-<< /Length 9109 >>

+<< /Length 9120 >>

 stream

 1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET

 q

@@ -338,7 +338,7 @@ q
 1 0 0 1 91.03937 3 cm

 q

 0 0 0 rg

-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (3.4.1 \(2015-03-16\)) Tj T* ET

+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (3.4.2 \(2015-03-17\)) Tj T* ET

 Q

 Q

 q

@@ -381,7 +381,7 @@ q
 q

 0 0 .501961 rg

 0 0 .501961 RG

-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (http://pypi.python.org/pypi/decorator/3.4.1) Tj T* ET

+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (http://pypi.python.org/pypi/decorator/3.4.2) Tj T* ET

 Q

 Q

 q

@@ -401,7 +401,7 @@ Q
 q

 1 0 0 1 91.03937 3 cm

 q

-BT 1 0 0 1 0 2 Tm 12 TL /F4 10 Tf 0 0 0 rg (easy_install) Tj ( ) Tj (decorator) Tj T* ET

+BT 1 0 0 1 0 2 Tm 12 TL /F4 10 Tf 0 0 0 rg (pip) Tj ( ) Tj (install) Tj ( ) Tj (decorator) Tj T* ET

 Q

 Q

 q

@@ -1861,7 +1861,7 @@ n 318 12.75 6 12 re f*
 .960784 .960784 .862745 rg

 n 330 12.75 24 12 re f*

 .960784 .960784 .862745 rg

-n 354 12.75 6 12 re f*

+n 3.4.22.75 6 12 re f*

 .960784 .960784 .862745 rg

 n 366 12.75 12 12 re f*

 .960784 .960784 .862745 rg

@@ -2583,7 +2583,7 @@ n 348 12.75 6 12 re f*
 .960784 .960784 .862745 rg

 n 360 12.75 24 12 re f*

 .960784 .960784 .862745 rg

-n 384 12.75 6 12 re f*

+n 3.4.22.75 6 12 re f*

 .960784 .960784 .862745 rg

 n 396 12.75 12 12 re f*

 .960784 .960784 .862745 rg

@@ -3467,7 +3467,7 @@ n 312 108.75 6 12 re f*
 .960784 .960784 .862745 rg

 n 318 108.75 6 12 re f*

 .960784 .960784 .862745 rg

-n 324 108.75 6 12 re f*

+n 3.4.208.75 6 12 re f*

 .960784 .960784 .862745 rg

 n 48 96.75 24 12 re f*

 .960784 .960784 .862745 rg

@@ -4988,7 +4988,7 @@ n 156 108.75 12 12 re f*
 .960784 .960784 .862745 rg

 n 24 96.75 18 12 re f*

 .960784 .960784 .862745 rg

-n 0 84.75 354 12 re f*

+n 0 84.75 3.4.22 re f*

 .960784 .960784 .862745 rg

 n 0 72.75 396 12 re f*

 .960784 .960784 .862745 rg

@@ -6546,41 +6546,41 @@ xref
 0000014324 00000 n

 0000014436 00000 n

 0000014603 00000 n

-0000023769 00000 n

-0000036376 00000 n

-0000053623 00000 n

-0000069507 00000 n

-0000091890 00000 n

-0000110195 00000 n

-0000126839 00000 n

-0000144261 00000 n

-0000158122 00000 n

-0000171904 00000 n

-0000185676 00000 n

-0000202654 00000 n

-0000213129 00000 n

-0000230480 00000 n

-0000237037 00000 n

-0000237236 00000 n

-0000237274 00000 n

-0000237312 00000 n

-0000237350 00000 n

-0000237388 00000 n

-0000237426 00000 n

-0000237464 00000 n

-0000237502 00000 n

-0000237540 00000 n

-0000237578 00000 n

-0000237617 00000 n

-0000237656 00000 n

-0000237695 00000 n

-0000237734 00000 n

-0000237773 00000 n

+0000023780 00000 n

+0000036387 00000 n

+0000053634 00000 n

+0000069518 00000 n

+0000091901 00000 n

+0000110206 00000 n

+0000126850 00000 n

+0000144272 00000 n

+0000158133 00000 n

+0000171915 00000 n

+0000185687 00000 n

+0000202665 00000 n

+0000213140 00000 n

+000023.4.2 00000 n

+0000237048 00000 n

+0000237247 00000 n

+0000237285 00000 n

+0000237323 00000 n

+0000237361 00000 n

+0000237399 00000 n

+0000237437 00000 n

+0000237475 00000 n

+0000237513 00000 n

+0000237551 00000 n

+0000237589 00000 n

+0000237628 00000 n

+0000237667 00000 n

+0000237706 00000 n

+0000237745 00000 n

+0000237784 00000 n

 trailer

 << /ID 

  % ReportLab generated PDF document -- digest (http://www.reportlab.com)

- [(SU\214\363\250\006M\005\356\362\\\343\)\352\220A) (SU\214\363\250\006M\005\356\362\\\343\)\352\220A)]

+ [(\201Gui?\227\341\310R\220\244p\025\360\0110) (\201Gui?\227\341\310R\220\244p\025\360\0110)]

  /Info 67 0 R /Root 66 0 R /Size 116 >>

 startxref

-237812

+237823

 %%EOF

diff --git a/documentation.py b/documentation.py
index 9f5c111..cd87a8e 100644
--- a/documentation.py
+++ b/documentation.py
@@ -7,7 +7,7 @@ The ``decorator`` module
 :Version: $VERSION ($DATE)
 :Requires: Python 2.4+
 :Download page: http://pypi.python.org/pypi/decorator/$VERSION
-:Installation: ``easy_install decorator``
+:Installation: ``pip install decorator``
 :License: BSD license
 
 .. contents::
diff --git a/documentation.rst b/documentation.rst
index 1fda579..90c47a5 100644
--- a/documentation.rst
+++ b/documentation.rst
@@ -4,10 +4,10 @@ The ``decorator`` module
 
 :Author: Michele Simionato
 :E-mail: michele.simionato@gmail.com
-:Version: 3.4.1 (2015-03-16)
+:Version: 3.4.2 (2015-03-17)
 :Requires: Python 2.4+
-:Download page: http://pypi.python.org/pypi/decorator/3.4.1
-:Installation: ``easy_install decorator``
+:Download page: http://pypi.python.org/pypi/decorator/3.4.2
+:Installation: ``pip install decorator``
 :License: BSD license
 
 .. contents::
diff --git a/documentation3.pdf b/documentation3.pdf
index f75e2cc..9c200d6 100644
--- a/documentation3.pdf
+++ b/documentation3.pdf
@@ -16,7 +16,7 @@ endobj
 << /A << /S /URI /Type /Action /URI (mailto:michele.simionato@gmail.com) >> /Border [ 0 0 0 ] /Rect [ 153.7323 704.7736 289.4623 716.7736 ] /Subtype /Link /Type /Annot >>

 endobj

 6 0 obj

-<< /A << /S /URI /Type /Action /URI (http://pypi.python.org/pypi/decorator/3.4.1) >> /Border [ 0 0 0 ] /Rect [ 153.7323 659.7736 526.5827 671.7736 ] /Subtype /Link /Type /Annot >>

+<< /A << /S /URI /Type /Action /URI (http://pypi.python.org/pypi/decorator/3.4.2) >> /Border [ 0 0 0 ] /Rect [ 153.7323 659.7736 526.5827 671.7736 ] /Subtype /Link /Type /Annot >>

 endobj

 7 0 obj

 << /BaseFont /Courier /Encoding /WinAnsiEncoding /Name /F4 /Subtype /Type1 /Type /Font >>

@@ -239,7 +239,7 @@ endobj
 << /Outlines 75 0 R /PageLabels 109 0 R /PageMode /UseNone /Pages 92 0 R /Type /Catalog >>

 endobj

 74 0 obj

-<< /Author (Michele Simionato) /CreationDate (D:20150316162017-01'00') /Creator (\(unspecified\)) /Keywords () /Producer (ReportLab PDF Library - www.reportlab.com) /Subject (\(unspecified\)) 

+<< /Author (Michele Simionato) /CreationDate (D:20150317194853-01'00') /Creator (\(unspecified\)) /Keywords () /Producer (ReportLab PDF Library - www.reportlab.com) /Subject (\(unspecified\)) 

   /Title (The decorator module) >>

 endobj

 75 0 obj

@@ -298,7 +298,7 @@ endobj
   61 0 R 63 0 R 64 0 R 66 0 R 71 0 R 72 0 R ] /Type /Pages >>

 endobj

 93 0 obj

-<< /Length 8970 >>

+<< /Length 8981 >>

 stream

 1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET

 q

@@ -363,7 +363,7 @@ q
 1 0 0 1 91.03937 3 cm

 q

 0 0 0 rg

-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (3.4.1 \(2015-03-16\)) Tj T* ET

+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (3.4.2 \(2015-03-17\)) Tj T* ET

 Q

 Q

 q

@@ -406,7 +406,7 @@ q
 q

 0 0 .501961 rg

 0 0 .501961 RG

-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (http://pypi.python.org/pypi/decorator/3.4.1) Tj T* ET

+BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (http://pypi.python.org/pypi/decorator/3.4.2) Tj T* ET

 Q

 Q

 q

@@ -426,7 +426,7 @@ Q
 q

 1 0 0 1 91.03937 3 cm

 q

-BT 1 0 0 1 0 2 Tm 12 TL /F4 10 Tf 0 0 0 rg (easy_install) Tj ( ) Tj (decorator) Tj T* ET

+BT 1 0 0 1 0 2 Tm 12 TL /F4 10 Tf 0 0 0 rg (pip) Tj ( ) Tj (install) Tj ( ) Tj (decorator) Tj T* ET

 Q

 Q

 q

@@ -2914,7 +2914,7 @@ n 300 12.75 6 12 re f*
 .960784 .960784 .862745 rg

 n 306 12.75 48 12 re f*

 .960784 .960784 .862745 rg

-n 354 12.75 6 12 re f*

+n 3.4.22.75 6 12 re f*

 .960784 .960784 .862745 rg

 n 366 12.75 24 12 re f*

 .960784 .960784 .862745 rg

@@ -3830,7 +3830,7 @@ n 312 168.75 6 12 re f*
 .960784 .960784 .862745 rg

 n 318 168.75 6 12 re f*

 .960784 .960784 .862745 rg

-n 324 168.75 6 12 re f*

+n 3.4.268.75 6 12 re f*

 .960784 .960784 .862745 rg

 n 48 156.75 24 12 re f*

 .960784 .960784 .862745 rg

@@ -5355,7 +5355,7 @@ n 156 336.75 12 12 re f*
 .960784 .960784 .862745 rg

 n 24 324.75 18 12 re f*

 .960784 .960784 .862745 rg

-n 0 312.75 354 12 re f*

+n 0 312.75 3.4.22 re f*

 .960784 .960784 .862745 rg

 n 0 300.75 396 12 re f*

 .960784 .960784 .862745 rg

@@ -6679,43 +6679,43 @@ xref
 0000015920 00000 n

 0000016032 00000 n

 0000016206 00000 n

-0000025233 00000 n

-0000037517 00000 n

-0000053936 00000 n

-0000072471 00000 n

-0000093910 00000 n

-0000113111 00000 n

-0000127049 00000 n

-0000146974 00000 n

-0000163187 00000 n

-0000177912 00000 n

-0000192010 00000 n

-0000208189 00000 n

-0000216529 00000 n

-0000232666 00000 n

-0000242612 00000 n

-0000243507 00000 n

-0000243721 00000 n

-0000243759 00000 n

-0000243797 00000 n

-0000243835 00000 n

-0000243873 00000 n

-0000243911 00000 n

-0000243949 00000 n

-0000243987 00000 n

-0000244025 00000 n

-0000244063 00000 n

-0000244102 00000 n

-0000244141 00000 n

-0000244180 00000 n

-0000244219 00000 n

-0000244258 00000 n

-0000244297 00000 n

+0000025244 00000 n

+0000037528 00000 n

+0000053947 00000 n

+0000072482 00000 n

+0000093921 00000 n

+0000113122 00000 n

+0000127060 00000 n

+0000146985 00000 n

+0000163198 00000 n

+0000177923 00000 n

+0000192021 00000 n

+0000208200 00000 n

+0000216540 00000 n

+0000232677 00000 n

+0000242623 00000 n

+0000243518 00000 n

+0000243732 00000 n

+0000243770 00000 n

+0000243808 00000 n

+0000243846 00000 n

+0000243884 00000 n

+0000243922 00000 n

+0000243960 00000 n

+0000243998 00000 n

+0000244036 00000 n

+0000244074 00000 n

+0000244113 00000 n

+0000244152 00000 n

+0000244191 00000 n

+0000244230 00000 n

+0000244269 00000 n

+0000244308 00000 n

 trailer

 << /ID 

  % ReportLab generated PDF document -- digest (http://www.reportlab.com)

- [(\332:\210,\011\256\334I\352\235\026\321\241\263\032\277) (\332:\210,\011\256\334I\352\235\026\321\241\263\032\277)]

+ [(\300\216\371\014\004\314`\307\362'5s\012\323\373\037) (\300\216\371\014\004\314`\307\362'5s\012\323\373\037)]

  /Info 74 0 R /Root 73 0 R /Size 126 >>

 startxref

-244336

+244347

 %%EOF

diff --git a/documentation3.py b/documentation3.py
index dea3821..f2d3122 100644
--- a/documentation3.py
+++ b/documentation3.py
@@ -7,7 +7,7 @@ The ``decorator`` module
 :Version: $VERSION ($DATE)
 :Requires: Python 2.4+
 :Download page: http://pypi.python.org/pypi/decorator/$VERSION
-:Installation: ``easy_install decorator``
+:Installation: ``pip install decorator``
 :License: BSD license
 
 .. contents::
diff --git a/documentation3.rst b/documentation3.rst
index 8de9f70..0c18b03 100644
--- a/documentation3.rst
+++ b/documentation3.rst
@@ -4,10 +4,10 @@ The ``decorator`` module
 
 :Author: Michele Simionato
 :E-mail: michele.simionato@gmail.com
-:Version: 3.4.1 (2015-03-16)
+:Version: 3.4.2 (2015-03-17)
 :Requires: Python 2.4+
-:Download page: http://pypi.python.org/pypi/decorator/3.4.1
-:Installation: ``easy_install decorator``
+:Download page: http://pypi.python.org/pypi/decorator/3.4.2
+:Installation: ``pip install decorator``
 :License: BSD license
 
 .. contents::
diff --git a/index.html b/index.html
index e6a6a40..32399ce 100644
--- a/index.html
+++ b/index.html
@@ -393,10 +393,10 @@ old version.</p>
 <h1>Documentation</h1>
 <p>There are various versions of the documentation:</p>
 <ul class="simple">
-<li><a class="reference external" href="https://github.com/micheles/decorator/blob/3.4.1/documentation.rst">HTML version (Python 2)</a></li>
-<li><a class="reference external" href="https://github.com/micheles/decorator/blob/3.4.1/documentation.pdf">PDF version (Python 2)</a></li>
-<li><a class="reference external" href="https://github.com/micheles/decorator/blob/3.4.1/documentation3.rst">HTML version (Python 3)</a></li>
-<li><a class="reference external" href="https://github.com/micheles/decorator/blob/3.4.1/documentation3.pdf">PDF version (Python 3)</a></li>
+<li><a class="reference external" href="https://github.com/micheles/decorator/blob/3.4.2/documentation.rst">HTML version (Python 2)</a></li>
+<li><a class="reference external" href="https://github.com/micheles/decorator/blob/3.4.2/documentation.pdf">PDF version (Python 2)</a></li>
+<li><a class="reference external" href="https://github.com/micheles/decorator/blob/3.4.2/documentation3.rst">HTML version (Python 3)</a></li>
+<li><a class="reference external" href="https://github.com/micheles/decorator/blob/3.4.2/documentation3.pdf">PDF version (Python 3)</a></li>
 </ul>
 </div>
 <div class="section" id="repository">
diff --git a/src/decorator.py b/src/decorator.py
index ece2488..84278bb 100644
--- a/src/decorator.py
+++ b/src/decorator.py
@@ -32,7 +32,7 @@ Decorator module, see http://pypi.python.org/pypi/decorator
 for the documentation.
 """
 
-__version__ = '3.4.1'
+__version__ = '3.4.2'
 
 __all__ = ["decorator", "FunctionMaker", "contextmanager"]