Changeset 581 for trunk

Timestamp:

Jun 3, 2008, 1:59:17 AM (17 years ago)

Author:

ecprice

Message:

Avoid using os.environ in wsgi.

File:

• trunk/packages/sipb-xen-www/code/main.py (modified) (4 diffs)

trunk/packages/sipb-xen-www/code/main.py

@@ -7 +7 @@
 import datetime
 import hmac
-import os
 import sha
 import simplejson
@@ -263 +262 @@
              has_vnc=has_vnc,
              machine=machine,
-             hostname=os.environ.get('SERVER_NAME', 'localhost'),
+             hostname=state.environ.get('SERVER_NAME', 'localhost'),
              authtoken=token)
     return templates.vnc(searchList=[d])
@@ -613 +612 @@
         self.username = getUser(environ)
         self.state = State(self.username)
+        self.state.environ = environ
 
     def __iter__(self):
@@ -620 +620 @@
         if not operation:
             self.start("301 Moved Permanently", [('Location',
-                                                  os.environ['SCRIPT_NAME']+'/')])
+                                                  self.environ['SCRIPT_NAME']+'/')])
             return
         if self.username is None: