[Checkins] SVN: zope.session/trunk/ Shut up Python 2.6.

[Dan Korostelev]

Log message for revision 98114:
  Shut up Python 2.6.
  Drop dependency on zope.app.http by using function from zope.datetime.
  Remove zpkg files and zcml slugs.
  

Changed:
  U   zope.session/trunk/CHANGES.txt
  U   zope.session/trunk/setup.py
  D   zope.session/trunk/src/zope/session/DEPENDENCIES.cfg
  D   zope.session/trunk/src/zope/session/SETUP.cfg
  U   zope.session/trunk/src/zope/session/http.py
  D   zope.session/trunk/src/zope/session/zope.session-configure.zcml

-=-
Modified: zope.session/trunk/CHANGES.txt
===================================================================
--- zope.session/trunk/CHANGES.txt	2009-03-14 20:14:47 UTC (rev 98113)
+++ zope.session/trunk/CHANGES.txt	2009-03-14 20:15:43 UTC (rev 98114)
@@ -4,8 +4,13 @@
 3.8.2 (unreleased)
 ------------------
 
-- ...
+- Don't raise deprecation warnings on Python 2.6.
 
+- Drop dependency on zope.app.http, use http-date building function
+  from zope.datetime instead.
+
+- Remove zpkg files and zcml slugs.
+
 3.8.1 (2009-02-23)
 ------------------
 

Modified: zope.session/trunk/setup.py
===================================================================
--- zope.session/trunk/setup.py	2009-03-14 20:14:47 UTC (rev 98113)
+++ zope.session/trunk/setup.py	2009-03-14 20:15:43 UTC (rev 98114)
@@ -65,7 +65,7 @@
         'ZODB3',
         'zope.annotation',
         'zope.app.appsetup',
-        'zope.app.http',
+        'zope.datetime',
         'zope.component',
         'zope.i18nmessageid',
         'zope.interface',

Deleted: zope.session/trunk/src/zope/session/DEPENDENCIES.cfg
===================================================================
--- zope.session/trunk/src/zope/session/DEPENDENCIES.cfg	2009-03-14 20:14:47 UTC (rev 98113)
+++ zope.session/trunk/src/zope/session/DEPENDENCIES.cfg	2009-03-14 20:15:43 UTC (rev 98114)
@@ -1,12 +0,0 @@
-BTrees
-ZODB
-persistent
-zope.component
-zope.interface
-zope.minmax
-zope.publisher
-zope.schema
-
-# TODO This dependency is bad.  It reflects use of a utility function
-# that should be copied elsewhere:
-zope.server

Deleted: zope.session/trunk/src/zope/session/SETUP.cfg
===================================================================
--- zope.session/trunk/src/zope/session/SETUP.cfg	2009-03-14 20:14:47 UTC (rev 98113)
+++ zope.session/trunk/src/zope/session/SETUP.cfg	2009-03-14 20:15:43 UTC (rev 98114)
@@ -1,3 +0,0 @@
-<data-files zopeskel/etc/package-includes>
-  zope.session-*.zcml
-</data-files>

Modified: zope.session/trunk/src/zope/session/http.py
===================================================================
--- zope.session/trunk/src/zope/session/http.py	2009-03-14 20:14:47 UTC (rev 98113)
+++ zope.session/trunk/src/zope/session/http.py	2009-03-14 20:15:43 UTC (rev 98114)
@@ -19,14 +19,19 @@
 import logging
 import random
 import re
-import sha
 import string
 import time
 from cStringIO import StringIO
+try:
+    from hashlib import sha1
+except ImportError:
+    # Python 2.4
+    from sha import new as sha1
 
 import zope.location
 from persistent import Persistent
 from zope import schema, component
+from zope.datetime import rfc1123_date
 from zope.interface import implements
 from zope.publisher.interfaces.http import IHTTPRequest
 from zope.publisher.interfaces.http import IHTTPApplicationRequest
@@ -35,8 +40,6 @@
 from zope.session.interfaces import IClientIdManager
 from zope.schema.fieldproperty import FieldProperty
 
-from zope.app.http.httpdate import build_http_date
-
 __docformat__ = 'restructuredtext'
 
 cookieSafeTrans = string.maketrans("+/", "-.")
@@ -251,11 +254,11 @@
 
         """
         data = "%.20f%.20f%.20f" % (random.random(), time.time(), time.clock())
-        digest = sha.sha(data).digest()
+        digest = sha1(data).digest()
         s = digestEncode(digest)
         # we store a HMAC of the random value together with it, which makes
         # our session ids unforgeable.
-        mac = hmac.new(s, self.secret, digestmod=sha).digest()
+        mac = hmac.new(s, self.secret, digestmod=sha1).digest()
         return s + digestEncode(mac)
 
     def getRequestId(self, request):
@@ -339,7 +342,7 @@
             # call encode() on value s a workaround a bug where the hmac
             # module only accepts str() types in Python 2.6
             if (digestEncode(hmac.new(
-                    s.encode(), self.secret, digestmod=sha
+                    s.encode(), self.secret, digestmod=sha1
                 ).digest()) != mac):
                 return None
             else:
@@ -449,7 +452,7 @@
         options = {}
         if self.cookieLifetime is not None:
             if self.cookieLifetime:
-                expires = build_http_date(time.time() + self.cookieLifetime)
+                expires = rfc1123_date(time.time() + self.cookieLifetime)
             else:
                 expires = 'Tue, 19 Jan 2038 00:00:00 GMT'
 

Deleted: zope.session/trunk/src/zope/session/zope.session-configure.zcml
===================================================================
--- zope.session/trunk/src/zope/session/zope.session-configure.zcml	2009-03-14 20:14:47 UTC (rev 98113)
+++ zope.session/trunk/src/zope/session/zope.session-configure.zcml	2009-03-14 20:15:43 UTC (rev 98114)
@@ -1 +0,0 @@
-<include package="zope.session" />