From: Georg Brandl <georg@python.org>
Date: Mon, 2 Aug 2010 21:38:30 +0000 (+0000)
Subject: Blocked revisions 83524,83526-83528 via svnmerge
X-Git-Tag: v2.7.1rc1~484
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09b7cbaacc22f4b56eec05623b35bf89deb39253;p=python

Blocked revisions 83524,83526-83528 via svnmerge

........
  r83524 | georg.brandl | 2010-08-02 14:20:23 +0200 (Mo, 02 Aug 2010) | 1 line

  #9428: fix running scripts from profile/cProfile with their own name and the right namespace.  Same fix as for trace.py in #1690103.
........
  r83526 | georg.brandl | 2010-08-02 14:40:22 +0200 (Mo, 02 Aug 2010) | 1 line

  Fix softspace relic.
........
  r83527 | georg.brandl | 2010-08-02 14:48:46 +0200 (Mo, 02 Aug 2010) | 1 line

  #3821: beginnings of a trace.py unittest.
........
  r83528 | georg.brandl | 2010-08-02 14:54:24 +0200 (Mo, 02 Aug 2010) | 1 line

  Document how to refer to decorators and decorator methods.
........
---