[Zope3-checkins] SVN: Zope3/branches/srichter-twisted-integration2/src/zope/ Merged

Stephan Richter srichter at cosmos.phy.tufts.edu
Thu Sep 8 08:10:41 EDT 2005


Log message for revision 38385:
  Merged
  
  r30030 | srichter | 2005-04-18 16:31:36 -0400 (Mon, 18 Apr 2005) | 8 lines
  
  Moved zope.server.http.http_date to zope.app.http.httpdate, since it
  contains some utilities that are useful beyond the server, which will be
  removed shortly.
  
  Also, zope.app.session used this module, which made it dependent on
  zope.server, sigh.
  
  

Changed:
  A   Zope3/branches/srichter-twisted-integration2/src/zope/app/http/httpdate.py
  U   Zope3/branches/srichter-twisted-integration2/src/zope/app/session/http.py
  D   Zope3/branches/srichter-twisted-integration2/src/zope/server/http/http_date.py

-=-
Copied: Zope3/branches/srichter-twisted-integration2/src/zope/app/http/httpdate.py (from rev 30030, Zope3/branches/srichter-twisted-integration/src/zope/app/http/httpdate.py)


Property changes on: Zope3/branches/srichter-twisted-integration2/src/zope/app/http/httpdate.py
___________________________________________________________________
Name: cvs2svn:cvs-rev
   + 1.5
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Modified: Zope3/branches/srichter-twisted-integration2/src/zope/app/session/http.py
===================================================================
--- Zope3/branches/srichter-twisted-integration2/src/zope/app/session/http.py	2005-09-08 10:17:23 UTC (rev 38384)
+++ Zope3/branches/srichter-twisted-integration2/src/zope/app/session/http.py	2005-09-08 12:10:41 UTC (rev 38385)
@@ -24,7 +24,7 @@
 from zope.app.component.interfaces import ILocalUtility
 from zope import schema
 from zope.interface import implements
-from zope.server.http.http_date import build_http_date
+from zope.app.http.httpdate import build_http_date
 from zope.publisher.interfaces.http import IHTTPApplicationRequest
 import hmac
 import random

Deleted: Zope3/branches/srichter-twisted-integration2/src/zope/server/http/http_date.py
===================================================================
--- Zope3/branches/srichter-twisted-integration2/src/zope/server/http/http_date.py	2005-09-08 10:17:23 UTC (rev 38384)
+++ Zope3/branches/srichter-twisted-integration2/src/zope/server/http/http_date.py	2005-09-08 12:10:41 UTC (rev 38385)
@@ -1,147 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""HTTP Server Date/Time utilities
-
-$Id$
-"""
-import re
-import string
-import time
-import calendar
-
-def concat(*args):
-    return ''.join(args)
-
-def join(seq, field=' '):
-    return field.join(seq)
-
-def group(s):
-    return '(' + s + ')'
-
-short_days = ['sun','mon','tue','wed','thu','fri','sat']
-long_days = ['sunday','monday','tuesday','wednesday',
-             'thursday','friday','saturday']
-
-short_day_reg = group(join(short_days, '|'))
-long_day_reg = group(join(long_days, '|'))
-
-daymap = {}
-for i in range(7):
-    daymap[short_days[i]] = i
-    daymap[long_days[i]] = i
-
-hms_reg = join(3 * [group('[0-9][0-9]')], ':')
-
-months = ['jan','feb','mar','apr','may','jun','jul',
-          'aug','sep','oct','nov','dec']
-
-monmap = {}
-for i in range(12):
-    monmap[months[i]] = i+1
-
-months_reg = group(join(months, '|'))
-
-# From draft-ietf-http-v11-spec-07.txt/3.3.1
-#       Sun, 06 Nov 1994 08:49:37 GMT  ; RFC 822, updated by RFC 1123
-#       Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036
-#       Sun Nov  6 08:49:37 1994       ; ANSI C's asctime() format
-
-# rfc822 format
-rfc822_date = join(
-        [concat (short_day_reg,','),            # day
-         group('[0-9][0-9]?'),                  # date
-         months_reg,                            # month
-         group('[0-9]+'),                       # year
-         hms_reg,                               # hour minute second
-         'gmt'
-         ],
-        ' '
-        )
-
-rfc822_reg = re.compile(rfc822_date)
-
-def unpack_rfc822(m):
-    g = m.group
-    a = string.atoi
-    return (
-            a(g(4)),             # year
-            monmap[g(3)],        # month
-            a(g(2)),             # day
-            a(g(5)),             # hour
-            a(g(6)),             # minute
-            a(g(7)),             # second
-            0,
-            0,
-            0
-            )
-
-    # rfc850 format
-rfc850_date = join(
-        [concat(long_day_reg,','),
-         join(
-                 [group ('[0-9][0-9]?'),
-                  months_reg,
-                  group ('[0-9]+')
-                  ],
-                 '-'
-                 ),
-         hms_reg,
-         'gmt'
-         ],
-        ' '
-        )
-
-rfc850_reg = re.compile(rfc850_date)
-# they actually unpack the same way
-def unpack_rfc850(m):
-    g = m.group
-    a = string.atoi
-    return (
-            a(g(4)),           # year
-            monmap[g(3)],      # month
-            a(g(2)),           # day
-            a(g(5)),           # hour
-            a(g(6)),           # minute
-            a(g(7)),           # second
-            0,
-            0,
-            0
-            )
-
-    # parsdate.parsedate        - ~700/sec.
-    # parse_http_date            - ~1333/sec.
-
-weekdayname = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-monthname = [None, 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-             'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-
-def build_http_date(when):
-    year, month, day, hh, mm, ss, wd, y, z = time.gmtime(when)
-    return "%s, %02d %3s %4d %02d:%02d:%02d GMT" % (
-            weekdayname[wd],
-            day, monthname[month], year,
-            hh, mm, ss)
-
-def parse_http_date(d):
-    d = d.lower()
-    m = rfc850_reg.match(d)
-    if m and m.end() == len(d):
-        retval = int(calendar.timegm(unpack_rfc850(m)))
-    else:
-        m = rfc822_reg.match(d)
-        if m and m.end() == len(d):
-            retval = int(calendar.timegm(unpack_rfc822(m)))
-        else:
-            return 0
-    return retval



More information about the Zope3-Checkins mailing list