[Zope-Checkins] CVS: Zope/lib/python/Products/Sessions - BrowserIdManager.py:1.18.20.1

[Jim Fulton]

Update of /cvs-repository/Zope/lib/python/Products/Sessions
In directory cvs.zope.org:/tmp/cvs-serv24052/lib/python/Products/Sessions

Modified Files:
      Tag: Zope-2_8-devel-branch
	BrowserIdManager.py 
Log Message:
merged everything but ZODB and ZEO from zodb33-devel-branch


=== Zope/lib/python/Products/Sessions/BrowserIdManager.py 1.18 => 1.18.20.1 ===
--- Zope/lib/python/Products/Sessions/BrowserIdManager.py:1.18	Wed Jul  9 12:25:10 2003
+++ Zope/lib/python/Products/Sessions/BrowserIdManager.py	Tue Nov 25 15:17:36 2003
@@ -523,15 +523,13 @@
     return (bid[:8], bid[8:19])
 
 
-def isAWellFormedBrowserId(bid, binerr=binascii.Error,
-                            timestamperr=TimeStamp.error):
+def isAWellFormedBrowserId(bid, binerr=binascii.Error):
     try:
         rnd, ts = getBrowserIdPieces(bid)
         int(rnd)
         getB64TStampToInt(ts)
         return bid
-    except (TypeError, ValueError, AttributeError, IndexError, binerr,
-            timestamperr):
+    except (TypeError, ValueError, AttributeError, IndexError, binerr):
         return None