Changeset 754

Timestamp:

05/29/07 11:01:32 (6 years ago)

Author:

bass_boy

Message:

Security.xml

Location:

branch/bass_boy

Files:

• config/security.xml (added)
• umitGUI/App.py (modified) (5 diffs)
• umitGUI/ScanNotebook.py (modified) (1 diff)
• umitGUI/misc (added)
• umitWeb/SecurityParser.py (added)
• umitWeb/media/js/ajax.js (modified) (1 diff)
• umitweb.py (modified) (1 diff)

branch/bass_boy/umitGUI/App.py

@@ -23 +23 @@
 import sys
 import optparse
-import imp
 
 import gtk
@@ -38 +37 @@
 
 # Script found at http://www.py2exe.org/index.cgi/HowToDetermineIfRunningFromExe
+import imp
+frozen = (hasattr(sys, "frozen") or # new py2exe
+          hasattr(sys, "importers") # old py2exe
+          or imp.is_frozen("__main__")) # tools/freeze
+del(imp)
+
 def main_is_frozen():
-    return (hasattr(sys, "frozen") or # new py2exe
-            hasattr(sys, "importers") # old py2exe
-            or imp.is_frozen("__main__")) # tools/freeze
+    return frozen
 
 
@@ -50 +53 @@
     def __create_option_parser(self):
         self.option_parser = optparse.OptionParser()
-
         self.options, self.args = self.option_parser.parse_args()
 
@@ -67 +69 @@
 
     def run(self):
-
         # Try to load psyco module, saving this information
         # if we care to use it later (such as in a About Dialog)
@@ -80 +81 @@
 but you're encourajed to install it to have a better speed experience. Download it \
 at http://psyco.sf.net/"""))
-
             self.using_psyco = False
 

branch/bass_boy/umitGUI/ScanNotebook.py

@@ -43 +43 @@
 from umitCore.I18N import _
 
-icon_dir = Path.get_pixmaps_dir()
+icon_dir = Path.pixmaps_dir
 
 class PageStatus(object):

branch/bass_boy/umitWeb/media/js/ajax.js

@@ -9 +9 @@
     $("result").innerHTML = "loading..."
     displayResult = function(){
-        if(req.readyState == 4){
-            if(req.status == 200){
-                $("result").innerHTML = "<pre>" + req.responseText + "</pre>"
-            }else{
-                $("result").innerHTML = req.statusText
+         try{
+            if(req.readyState == 4){
+                if(req.status == 200){
+                    $("result").innerHTML = "<pre>" + req.responseText + "</pre>"
+                }else{
+                    $("result").innerHTML = req.statusText
+                }
             }
+        }catch(e){
+            alert(e)
+            $("result").innerHTML = "Could not open Http Request."
         }
     }
-    
-    req.open("POST", "/scan/?plain", true)
-    req.onreadystatechange = displayResult
-    req.send("command=" + encodeURI($("command").value))
+    try{
+        req.open("POST", "/scan/?plain", true)
+        req.onreadystatechange = displayResult
+        req.send("command=" + encodeURI($("command").value))
+    }catch(e){
+        $("result").innerHTML = "Could not open Http Request."
+    }
+
     return false
 }

branch/bass_boy/umitweb.py

@@ -27 +27 @@
 # Setting the umit home directory
 
-#from umitCore.Paths import Path
-#Path.set_umit_conf(join(split(__file__)[0], 'config', 'umit.conf'))
+from umitCore.Paths import Path
+Path.set_umit_conf(join(split(__file__)[0], 'config', 'umit.conf'))
 ######################################