[Zope3-checkins] CVS: Zope3/src/zope/server/http - chunking.py:1.1.2.2 httprequestparser.py:1.1.2.2 httptask.py:1.1.2.2

[Guido van Rossum]

Update of /cvs-repository/Zope3/src/zope/server/http
In directory cvs.zope.org:/tmp/cvs-serv13315/http

Modified Files:
      Tag: NameGeddon-branch
	chunking.py httprequestparser.py httptask.py 
Log Message:
Move selecttrigger up; you can't have a subpackage named 'thread' and
also import the built-in thread module, so getting rid of the thread
subpackage (which only contains selecttrigger.py).

BTW, selecttrigger.py seems unused and untested here.

=== Zope3/src/zope/server/http/chunking.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/server/http/chunking.py:1.1.2.1	Mon Dec 23 14:33:21 2002
+++ Zope3/src/zope/server/http/chunking.py	Mon Dec 23 16:45:28 2002
@@ -17,7 +17,7 @@
 """
 
 from zope.server.utilities import find_double_newline
-from zope.server.interfaces.interfaces import IStreamConsumer
+from zope.server.interfaces import IStreamConsumer
 
 
 class ChunkedReceiver:


=== Zope3/src/zope/server/http/httprequestparser.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/server/http/httprequestparser.py:1.1.2.1	Mon Dec 23 14:33:21 2002
+++ Zope3/src/zope/server/http/httprequestparser.py	Mon Dec 23 16:45:28 2002
@@ -24,7 +24,7 @@
 from zope.server.fixedstreamreceiver import FixedStreamReceiver
 from zope.server.buffers import OverflowableBuffer
 from zope.server.utilities import find_double_newline
-from zope.server.interfaces.interfaces import IStreamConsumer
+from zope.server.interfaces import IStreamConsumer
 
 try:
     from cStringIO import StringIO


=== Zope3/src/zope/server/http/httptask.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/server/http/httptask.py:1.1.2.1	Mon Dec 23 14:33:21 2002
+++ Zope3/src/zope/server/http/httptask.py	Mon Dec 23 16:45:28 2002
@@ -23,8 +23,8 @@
 
 from zope.server.http.http_date import build_http_date
 
-from zope.server.interfaces.interfaces import IHeaderOutput
-from zope.server.interfaces.interfaces import ITask
+from zope.server.interfaces import IHeaderOutput
+from zope.server.interfaces import ITask
 
 rename_headers = {
     'CONTENT_LENGTH' : 'CONTENT_LENGTH',