From: Senthil Kumaran <senthil@uthcode.com>
Date: Thu, 28 Jul 2011 15:39:08 +0000 (+0800)
Subject: merge from 3.2 - Fix closes Issue11439 Remove the SVN keywords from the code as it... 
X-Git-Tag: v3.3.0a1~1824
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2250e61db26e6f03d035e8c16e5305e57714323;p=thirdparty%2FPython%2Fcpython.git

merge from 3.2 - Fix closes Issue11439 Remove the SVN keywords from the code as it is no longer applicable in hg. Patch Contributed by Neil Muller.
---

a2250e61db26e6f03d035e8c16e5305e57714323
diff --cc Lib/curses/__init__.py
index 5cd4edac369b,303ea3e79108..61ce443a6859
--- a/Lib/curses/__init__.py
+++ b/Lib/curses/__init__.py
@@@ -10,9 -10,8 +10,7 @@@ the package, and perhaps a particular m
  
  """
  
- __revision__ = "$Id$"
- 
  from _curses import *
 -from curses.wrapper import wrapper
  import os as _os
  import sys as _sys
  
diff --cc Lib/tarfile.py
index 8129a80330bb,63c7554af20d..bd92dedd677c
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@@ -29,10 -29,12 +29,10 @@@
  """Read from and write to tar format archives.
  """
  
 -__version__ = "$Revision$"
 -
  version     = "0.9.0"
  __author__  = "Lars Gust\u00e4bel (lars@gustaebel.de)"
- __date__    = "$Date$"
- __cvsid__   = "$Id$"
+ __date__    = "$Date: 2011-02-25 17:42:01 +0200 (Fri, 25 Feb 2011) $"
+ __cvsid__   = "$Id: tarfile.py 88586 2011-02-25 15:42:01Z marc-andre.lemburg $"
  __credits__ = "Gustavo Niemeyer, Niels Gust\u00e4bel, Richard Townsend."
  
  #---------
diff --cc Lib/textwrap.py
index f014cb0cf3d3,dfb400548bd4..0aeba3f3246b
--- a/Lib/textwrap.py
+++ b/Lib/textwrap.py
@@@ -5,9 -5,7 +5,7 @@@
  # Copyright (C) 2002, 2003 Python Software Foundation.
  # Written by Greg Ward <gward@python.net>
  
- __revision__ = "$Id$"
- 
 -import string, re
 +import re
  
  __all__ = ['TextWrapper', 'wrap', 'fill', 'dedent']