quetz-mod_python-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nleh...@apache.org
Subject svn commit: r374268 - in /httpd/mod_python/trunk/lib/python/mod_python: Cookie.py Session.py apache.py cache.py cgihandler.py psp.py publisher.py python22.py testhandler.py util.py
Date Thu, 02 Feb 2006 05:31:53 GMT
Author: nlehuen
Date: Wed Feb  1 21:31:45 2006
New Revision: 374268

URL: http://svn.apache.org/viewcvs?rev=374268&view=rev
Log:
Reverted the Python 2.2 support hack ; I leave python22.py in place because it should be possible
to use it with PythonImport.

Modified:
    httpd/mod_python/trunk/lib/python/mod_python/Cookie.py
    httpd/mod_python/trunk/lib/python/mod_python/Session.py
    httpd/mod_python/trunk/lib/python/mod_python/apache.py
    httpd/mod_python/trunk/lib/python/mod_python/cache.py
    httpd/mod_python/trunk/lib/python/mod_python/cgihandler.py
    httpd/mod_python/trunk/lib/python/mod_python/psp.py
    httpd/mod_python/trunk/lib/python/mod_python/publisher.py
    httpd/mod_python/trunk/lib/python/mod_python/python22.py
    httpd/mod_python/trunk/lib/python/mod_python/testhandler.py
    httpd/mod_python/trunk/lib/python/mod_python/util.py

Modified: httpd/mod_python/trunk/lib/python/mod_python/Cookie.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/Cookie.py?rev=374268&r1=374267&r2=374268&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/Cookie.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/Cookie.py Wed Feb  1 21:31:45 2006
@@ -40,9 +40,6 @@
 
 """
 
-# Loads Python 2.2 compatibility module
-from python22 import *
-
 import time
 import re
 import hmac

Modified: httpd/mod_python/trunk/lib/python/mod_python/Session.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/Session.py?rev=374268&r1=374267&r2=374268&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/Session.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/Session.py Wed Feb  1 21:31:45 2006
@@ -17,9 +17,6 @@
  #
  # $Id$
 
-# Loads Python 2.2 compatibility module
-from python22 import *
-
 import apache, Cookie
 import _apache
 

Modified: httpd/mod_python/trunk/lib/python/mod_python/apache.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/apache.py?rev=374268&r1=374267&r2=374268&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/apache.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/apache.py Wed Feb  1 21:31:45 2006
@@ -17,9 +17,6 @@
  #
  # $Id$
 
-# Loads Python 2.2 compatibility module
-from python22 import *
-
 import sys
 import traceback
 import time

Modified: httpd/mod_python/trunk/lib/python/mod_python/cache.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/cache.py?rev=374268&r1=374267&r2=374268&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/cache.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/cache.py Wed Feb  1 21:31:45 2006
@@ -20,9 +20,6 @@
  # 
  # $Id$
 
-# Loads Python 2.2 compatibility module
-from python22 import *
-
 from os import stat
 from time import time, mktime
 from rfc822 import parsedate

Modified: httpd/mod_python/trunk/lib/python/mod_python/cgihandler.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/cgihandler.py?rev=374268&r1=374267&r2=374268&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/cgihandler.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/cgihandler.py Wed Feb  1 21:31:45 2006
@@ -17,9 +17,6 @@
  #
  # $Id$
 
-# Loads Python 2.2 compatibility module
-from python22 import *
-
 import apache
 import imp
 import os

Modified: httpd/mod_python/trunk/lib/python/mod_python/psp.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/psp.py?rev=374268&r1=374267&r2=374268&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/psp.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/psp.py Wed Feb  1 21:31:45 2006
@@ -17,9 +17,6 @@
  #
  # $Id$
 
-# Loads Python 2.2 compatibility module
-from python22 import *
-
 import apache, Session, util, _psp
 import _apache
 

Modified: httpd/mod_python/trunk/lib/python/mod_python/publisher.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/publisher.py?rev=374268&r1=374267&r2=374268&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/publisher.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/publisher.py Wed Feb  1 21:31:45 2006
@@ -28,9 +28,6 @@
   5. Does not give special meaning to '.' and '..'.
 """
 
-# Loads Python 2.2 compatibility module
-from python22 import *
-
 import apache
 import util
 

Modified: httpd/mod_python/trunk/lib/python/mod_python/python22.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/python22.py?rev=374268&r1=374267&r2=374268&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/python22.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/python22.py Wed Feb  1 21:31:45 2006
@@ -19,9 +19,9 @@
 
 # This file contains a bunch of hacks used to support Python 2.2
 
-from __future__ import generators
-
 import sys
 if sys.version < '2.3':
-  # Enumerate does not exists in Python 2.2
-  enumerate = lambda x : zip(range(len(x)),x)
+    import __builtin__ as hack
+    
+    # Enumerate does not exists in Python 2.2
+    hack.enumerate = lambda s : zip(xrange(len(s)),s)

Modified: httpd/mod_python/trunk/lib/python/mod_python/testhandler.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/testhandler.py?rev=374268&r1=374267&r2=374268&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/testhandler.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/testhandler.py Wed Feb  1 21:31:45 2006
@@ -17,9 +17,6 @@
  #
  # $Id$
 
-# Loads Python 2.2 compatibility module
-from python22 import *
-
 """
 
 This module is a mod_python handler that can be used to test the configuration.

Modified: httpd/mod_python/trunk/lib/python/mod_python/util.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/util.py?rev=374268&r1=374267&r2=374268&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/util.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/util.py Wed Feb  1 21:31:45 2006
@@ -18,9 +18,6 @@
 #
 # $Id$
 
-# Loads Python 2.2 compatibility module
-from python22 import *
-
 import _apache
 import apache
 import cStringIO



Mime
View raw message