Author: chrisz
Date: Fri Mar 16 17:49:32 2007
New Revision: 6324
Modified:
Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusAppServer.py
Webware/trunk/WebKit/Cookie.py
Webware/trunk/WebKit/Examples/View.py
Webware/trunk/WebKit/ExceptionHandler.py
Webware/trunk/WebKit/HTTPRequest.py
Webware/trunk/WebKit/HTTPResponse.py
Webware/trunk/WebKit/ImportManager.py
Webware/trunk/WebKit/Message.py
Webware/trunk/WebKit/ServletFactory.py
Webware/trunk/WebKit/ThreadedAppServer.py
Log:
Standardized order of import statements.
Modified: Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusAppServer.py
==============================================================================
--- Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusAppServer.py (original)
+++ Webware/trunk/WebKit/Adapters/CGIPlus/CgiPlusAppServer.py Fri Mar 16 17:49:32 2007
@@ -10,27 +10,23 @@
"""
-from Common import *
-import AppServer as AppServerModule
-from AutoReloadingAppServer import AutoReloadingAppServer as AppServer
-from MiscUtils.Funcs import timestamp
+import threading, Queue, select, socket, errno, traceback
from marshal import dumps, loads
-import os, sys
from threading import Lock, Thread, Event
-import threading
-import Queue
-import select
-import socket
-import threading
-import time
-import errno
-import traceback
-from WebUtils import Funcs
+
try:
from cStringIO import StringIO
except ImportError:
from StringIO import StringIO
+from Common import *
+import AppServer as AppServerModule
+from AutoReloadingAppServer import AutoReloadingAppServer as AppServer
+from MiscUtils.Funcs import timestamp
+from WebUtils import Funcs
+
+
+
debug = 0
DefaultConfig = {
Modified: Webware/trunk/WebKit/Cookie.py
==============================================================================
--- Webware/trunk/WebKit/Cookie.py (original)
+++ Webware/trunk/WebKit/Cookie.py Fri Mar 16 17:49:32 2007
@@ -1,4 +1,5 @@
from Common import *
+
from MiscUtils.Funcs import positive_id
# If this is Python 2.2 or greater, import the standard Cookie module
Modified: Webware/trunk/WebKit/Examples/View.py
==============================================================================
--- Webware/trunk/WebKit/Examples/View.py (original)
+++ Webware/trunk/WebKit/Examples/View.py Fri Mar 16 17:49:32 2007
@@ -2,6 +2,7 @@
from ExamplePage import ExamplePage
+
class View(ExamplePage):
"""View the source of a WebKit servlet.
Modified: Webware/trunk/WebKit/ExceptionHandler.py
==============================================================================
--- Webware/trunk/WebKit/ExceptionHandler.py (original)
+++ Webware/trunk/WebKit/ExceptionHandler.py Fri Mar 16 17:49:32 2007
@@ -1,5 +1,5 @@
-from types import DictType, StringType
-import time, traceback, types, random, sys, MimeWriter, smtplib, StringIO
+from types import DictType, ListType, StringType
+import traceback, random, MimeWriter, smtplib, StringIO
from time import asctime, localtime
from Common import *
@@ -537,7 +537,7 @@
+ str(sys.exc_info()[0]) + ': ' \
+ str(sys.exc_info()[1])
for h,v in headers.items():
- if isinstance(v, types.ListType):
+ if isinstance(v, ListType):
v = ','.join(v)
writer.addheader(h, v)
Modified: Webware/trunk/WebKit/HTTPRequest.py
==============================================================================
--- Webware/trunk/WebKit/HTTPRequest.py (original)
+++ Webware/trunk/WebKit/HTTPRequest.py Fri Mar 16 17:49:32 2007
@@ -1,4 +1,4 @@
-import os, cgi, sys, traceback
+import cgi, traceback
from types import ListType
from Common import *
Modified: Webware/trunk/WebKit/HTTPResponse.py
==============================================================================
--- Webware/trunk/WebKit/HTTPResponse.py (original)
+++ Webware/trunk/WebKit/HTTPResponse.py Fri Mar 16 17:49:32 2007
@@ -1,4 +1,4 @@
-from types import *
+from types import FloatType, IntType, LongType, StringType, TupleType
# Import mxDateTime if it exists,
# but we can get along with it if not.
@@ -10,11 +10,12 @@
except ImportError:
DateTime = None
+from Common import *
+
# time.gmtime() no longer returns a tuple, and there is no globally defined type
# for this at the moment.
TimeTupleType = type(time.gmtime(0))
-from Common import *
from Response import Response
from WebKit.Cookie import Cookie
from MiscUtils.DateInterval import timeDecode
Modified: Webware/trunk/WebKit/ImportManager.py
==============================================================================
--- Webware/trunk/WebKit/ImportManager.py (original)
+++ Webware/trunk/WebKit/ImportManager.py Fri Mar 16 17:49:32 2007
@@ -11,7 +11,7 @@
"""
-import os, sys, imp
+import imp
from Common import *
Modified: Webware/trunk/WebKit/Message.py
==============================================================================
--- Webware/trunk/WebKit/Message.py (original)
+++ Webware/trunk/WebKit/Message.py Fri Mar 16 17:49:32 2007
@@ -4,9 +4,9 @@
"""
-
from Common import *
+
class Message(Object):
"""A very general message class.
Modified: Webware/trunk/WebKit/ServletFactory.py
==============================================================================
--- Webware/trunk/WebKit/ServletFactory.py (original)
+++ Webware/trunk/WebKit/ServletFactory.py Fri Mar 16 17:49:32 2007
@@ -1,4 +1,3 @@
-import sys
from types import ClassType, BuiltinFunctionType
from keyword import iskeyword
import threading
Modified: Webware/trunk/WebKit/ThreadedAppServer.py
==============================================================================
--- Webware/trunk/WebKit/ThreadedAppServer.py (original)
+++ Webware/trunk/WebKit/ThreadedAppServer.py Fri Mar 16 17:49:32 2007
@@ -22,7 +22,7 @@
"""
from marshal import dumps, loads
-import os, sys, threading, Queue, select, socket, time, errno, traceback
+import threading, Queue, select, socket, errno, traceback
from Common import *
import AppServer as AppServerModule
|