Author: chrisz
Date: Fri Mar 16 18:05:00 2007
New Revision: 6325
Modified:
Webware/trunk/WebKit/Admin/Access.py
Webware/trunk/WebKit/Admin/AdminPage.py
Webware/trunk/WebKit/Admin/AdminSecurity.py
Webware/trunk/WebKit/Admin/AppControl.py
Webware/trunk/WebKit/Admin/Config.py
Webware/trunk/WebKit/Admin/DumpCSV.py
Webware/trunk/WebKit/Admin/EditFile.py
Webware/trunk/WebKit/Admin/Errors.py
Webware/trunk/WebKit/Admin/LoginPage.py
Webware/trunk/WebKit/Admin/Main.py
Webware/trunk/WebKit/Admin/ServletCache.py
Webware/trunk/WebKit/Session.py
Log:
Standardized order of import statements.
Modified: Webware/trunk/WebKit/Admin/Access.py
==============================================================================
--- Webware/trunk/WebKit/Admin/Access.py (original)
+++ Webware/trunk/WebKit/Admin/Access.py Fri Mar 16 18:05:00 2007
@@ -1,5 +1,6 @@
from DumpCSV import DumpCSV
+
class Access(DumpCSV):
def filename(self):
Modified: Webware/trunk/WebKit/Admin/AdminPage.py
==============================================================================
--- Webware/trunk/WebKit/Admin/AdminPage.py (original)
+++ Webware/trunk/WebKit/Admin/AdminPage.py Fri Mar 16 18:05:00 2007
@@ -1,6 +1,7 @@
-from WebKit.SidebarPage import SidebarPage
import os
+from WebKit.SidebarPage import SidebarPage
+
class AdminPage(SidebarPage):
"""AdminPage
Modified: Webware/trunk/WebKit/Admin/AdminSecurity.py
==============================================================================
--- Webware/trunk/WebKit/Admin/AdminSecurity.py (original)
+++ Webware/trunk/WebKit/Admin/AdminSecurity.py Fri Mar 16 18:05:00 2007
@@ -1,4 +1,3 @@
-import string, types
from AdminPage import AdminPage
# Set this to 0 if you want to allow everyone to access secure pages
@@ -6,7 +5,9 @@
require_login = 1
if not require_login:
+
class AdminSecurity(AdminPage):
+
def writeHTML(self):
session = self.session()
request = self.request()
@@ -18,7 +19,9 @@
AdminPage.writeHTML(self)
else:
+
class AdminSecurity(AdminPage):
+
def writeHTML(self):
session = self.session()
request = self.request()
Modified: Webware/trunk/WebKit/Admin/AppControl.py
==============================================================================
--- Webware/trunk/WebKit/Admin/AppControl.py (original)
+++ Webware/trunk/WebKit/Admin/AppControl.py Fri Mar 16 18:05:00 2007
@@ -1,6 +1,7 @@
+import sys
+
from AdminPage import AdminPage
from AdminSecurity import AdminSecurity
-import sys
class AppControl(AdminSecurity):
Modified: Webware/trunk/WebKit/Admin/Config.py
==============================================================================
--- Webware/trunk/WebKit/Admin/Config.py (original)
+++ Webware/trunk/WebKit/Admin/Config.py Fri Mar 16 18:05:00 2007
@@ -1,6 +1,7 @@
-from AdminSecurity import *
+from AdminSecurity import AdminSecurity
from WebUtils import Funcs
+
class Config(AdminSecurity):
def title(self):
Modified: Webware/trunk/WebKit/Admin/DumpCSV.py
==============================================================================
--- Webware/trunk/WebKit/Admin/DumpCSV.py (original)
+++ Webware/trunk/WebKit/Admin/DumpCSV.py Fri Mar 16 18:05:00 2007
@@ -1,4 +1,5 @@
import os
+
from AdminSecurity import AdminSecurity
from MiscUtils.DataTable import DataTable
Modified: Webware/trunk/WebKit/Admin/EditFile.py
==============================================================================
--- Webware/trunk/WebKit/Admin/EditFile.py (original)
+++ Webware/trunk/WebKit/Admin/EditFile.py Fri Mar 16 18:05:00 2007
@@ -1,5 +1,6 @@
from WebKit.Page import Page
+
class EditFile(Page):
def writeHTML(self):
Modified: Webware/trunk/WebKit/Admin/Errors.py
==============================================================================
--- Webware/trunk/WebKit/Admin/Errors.py (original)
+++ Webware/trunk/WebKit/Admin/Errors.py Fri Mar 16 18:05:00 2007
@@ -1,5 +1,6 @@
from DumpCSV import DumpCSV
+
class Errors(DumpCSV):
def filename(self):
Modified: Webware/trunk/WebKit/Admin/LoginPage.py
==============================================================================
--- Webware/trunk/WebKit/Admin/LoginPage.py (original)
+++ Webware/trunk/WebKit/Admin/LoginPage.py Fri Mar 16 18:05:00 2007
@@ -1,7 +1,9 @@
-from AdminPage import AdminPage
from random import randint
from time import time, localtime
+from AdminPage import AdminPage
+
+
class LoginPage(AdminPage):
"""The log-in screen for the admin pages."""
Modified: Webware/trunk/WebKit/Admin/Main.py
==============================================================================
--- Webware/trunk/WebKit/Admin/Main.py (original)
+++ Webware/trunk/WebKit/Admin/Main.py Fri Mar 16 18:05:00 2007
@@ -1,6 +1,7 @@
+import os
from time import time, localtime, gmtime, asctime
+
from AdminSecurity import AdminSecurity
-import os
class Main(AdminSecurity):
Modified: Webware/trunk/WebKit/Admin/ServletCache.py
==============================================================================
--- Webware/trunk/WebKit/Admin/ServletCache.py (original)
+++ Webware/trunk/WebKit/Admin/ServletCache.py Fri Mar 16 18:05:00 2007
@@ -1,7 +1,8 @@
-from AdminSecurity import AdminSecurity
+import os, time
from Queue import Queue
+
+from AdminSecurity import AdminSecurity
from WebUtils.Funcs import htmlEncode
-import os, time
class ServletCache(AdminSecurity):
Modified: Webware/trunk/WebKit/Session.py
==============================================================================
--- Webware/trunk/WebKit/Session.py (original)
+++ Webware/trunk/WebKit/Session.py Fri Mar 16 18:05:00 2007
@@ -1,5 +1,4 @@
import re
-from time import localtime, time
from Common import *
from MiscUtils.Funcs import uniqueId
@@ -46,7 +45,7 @@
def __init__(self, trans, identifier=None):
Object.__init__(self)
- self._lastAccessTime = self._creationTime = time()
+ self._lastAccessTime = self._creationTime = time.time()
self._isExpired = 0
self._numTrans = 0
self._values = {}
@@ -66,7 +65,7 @@
while attempts < 10000:
self._identifier = self._prefix + ''.join(
map(lambda x: '%02d' % x,
- localtime(time())[:6])) + '-' + uniqueId(self)
+ time.localtime(time.time())[:6])) + '-' + uniqueId(self)
if not app.hasSession(self._identifier):
break
attempts += 1
@@ -179,7 +178,7 @@
updates the 'lastAccessTime'.
"""
- self._lastAccessTime = time()
+ self._lastAccessTime = time.time()
self._numTrans += 1
def respond(self, trans):
|