[Zope-Checkins] CVS: Zope/ZServer/medusa - ftp_server.py:1.19 http_server.py:1.31 monitor.py:1.13 resolver.py:1.10

[Toby Dickenson]

Update of /cvs-repository/Zope/ZServer/medusa
In directory cvs.zope.org:/tmp/cvs-serv19972/ZServer/medusa

Modified Files:
	ftp_server.py http_server.py monitor.py resolver.py 
Log Message:
merged toby-safe-missing-cvs-revision-tags-branch; cvs -kk compatability

=== Zope/ZServer/medusa/ftp_server.py 1.18 => 1.19 ===
 #    methods, using try/finally. [this seems to work]
 
-VERSION = string.split(RCS_ID)[2]
+if RCS_ID.startswith('$Id: '):
+    VERSION = string.split(RCS_ID)[2]
+else:
+    VERSION = '0.0'
 
 from counter import counter
 import producers


=== Zope/ZServer/medusa/http_server.py 1.30 => 1.31 ===
 import logger
 
-VERSION_STRING = string.split(RCS_ID)[2]
+if RCS_ID.startswith('$Id: '):
+    VERSION_STRING = string.split(RCS_ID)[2]
+else:
+    VERSION_STRING = '0.0'
 
 from counter import counter
 from urllib import unquote


=== Zope/ZServer/medusa/monitor.py 1.12 => 1.13 ===
 import time
 
-VERSION = string.split(RCS_ID)[2]
+if RCS_ID.startswith('$Id: '):
+    VERSION = string.split(RCS_ID)[2]
+else:
+    VERSION = '0.0'
 
 import asyncore
 import asynchat


=== Zope/ZServer/medusa/resolver.py 1.9 => 1.10 ===
 from counter import counter
 
-VERSION = string.split(RCS_ID)[2]
+if RCS_ID.startswith('$Id: '):
+    VERSION = string.split(RCS_ID)[2]
+else:
+    VERSION = '0.0'
 
 # header
 #                                    1  1  1  1  1  1