[Inteproxy-commits] r73 - in trunk: . inteproxy

[scm-commit@wald.intevation.org]

Author: bh
Date: 2007-05-02 13:07:31 +0200 (Wed, 02 May 2007)
New Revision: 73

Modified:
   trunk/ChangeLog
   trunk/inteproxy/main.py
Log:
* inteproxy/main.py (run_server): Import the gtkapp module in the
main function to avoid loading it when running test cases.
Otherwise the gtk module will be loaded which requires a working X
server connection.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-05-02 11:01:20 UTC (rev 72)
+++ trunk/ChangeLog	2007-05-02 11:07:31 UTC (rev 73)
@@ -1,5 +1,12 @@
 2007-05-02  Bernhard Herzog  <bh at intevation.de>
 
+	* inteproxy/main.py (run_server): Import the gtkapp module in the
+	main function to avoid loading it when running test cases.
+	Otherwise the gtk module will be loaded which requires a working X
+	server connection.
+
+2007-05-02  Bernhard Herzog  <bh at intevation.de>
+
 	* inteproxy/feesdialog.py (run_fees_dialog): Moved to gtkapp.py.
 
 	* inteproxy/gtkapp.py (run_fees_dialog): Copy of

Modified: trunk/inteproxy/main.py
===================================================================
--- trunk/inteproxy/main.py	2007-05-02 11:01:20 UTC (rev 72)
+++ trunk/inteproxy/main.py	2007-05-02 11:07:31 UTC (rev 73)
@@ -18,7 +18,6 @@
 from inteproxy.proxycore import (InteProxyHTTPRequestHandler,
                                  MasterWorkerServer,
                                  log_date_time_string)
-from inteproxy.gtkapp import InteProxyApplication
 
 inteproxy_version = "0.1.2"
 
@@ -99,6 +98,10 @@
 
     httpd = ServerClass(server_address, HandlerClass, opts.workers)
 
+    # import the gtkapp here instead of at top-level to avoid loading
+    # the gtk module.  The gtk module requires an Xserver connection
+    # which is undesirable when running testcases.
+    from inteproxy.gtkapp import InteProxyApplication
     global the_application
     the_application = InteProxyApplication(httpd)