[Jython-checkins] jython (merge 2.5 -> default): merge with 2.5, remove more svn keywords

[philip.jenvey]

http://hg.python.org/jython/rev/f77a4bf6b24d
changeset:   6199:f77a4bf6b24d
parent:      6197:0c4ce8b0156c
parent:      6198:af8a3b6579e9
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Sat May 07 14:37:21 2011 -0700
summary:
  merge with 2.5, remove more svn keywords

files:
  Lib/test/zxjdbc/test.xml |  2 --
  Lib/xml/__init__.py      |  5 -----
  Misc/make_errno.py       |  2 --
  3 files changed, 0 insertions(+), 9 deletions(-)


diff --git a/Lib/test/zxjdbc/test.xml b/Lib/test/zxjdbc/test.xml
--- a/Lib/test/zxjdbc/test.xml
+++ b/Lib/test/zxjdbc/test.xml
@@ -3,8 +3,6 @@
 <!--
  Jython Database Specification API 2.0
 
- $Id$
-
  Copyright (c) 2001 brian zimmer <bzimmer at ziclix.com>
 -->
 
diff --git a/Lib/xml/__init__.py b/Lib/xml/__init__.py
--- a/Lib/xml/__init__.py
+++ b/Lib/xml/__init__.py
@@ -13,11 +13,6 @@
 
 __all__ = ['dom', 'sax']
 
-# When being checked-out without options, this has the form
-# "<dollar>Revision: x.y </dollar>"
-# When exported using -kv, it is "x.y".
-__version__ = "$Revision$".split()[-2:][0]
-
 
 _MINIMUM_XMLPLUS_VERSION = (0, 8, 5)
 
diff --git a/Misc/make_errno.py b/Misc/make_errno.py
--- a/Misc/make_errno.py
+++ b/Misc/make_errno.py
@@ -1,7 +1,5 @@
 # Asynchronous sockets in Jython.
 #
-# $Id$
-#
 # Copyright (c) 2002 brian zimmer <mailto:bzimmer at ziclix.com>
 
 '''

-- 
Repository URL: http://hg.python.org/jython