[Checkins] SVN: gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/base.py Simpler code for picking up settings from the environment.

[Jan-Jaap Driessen]

Log message for revision 118439:
  Simpler code for picking up settings from the environment.

Changed:
  U   gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/base.py

-=-
Modified: gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/base.py
===================================================================
--- gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/base.py	2010-11-17 09:16:31 UTC (rev 118438)
+++ gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/base.py	2010-11-17 14:21:01 UTC (rev 118439)
@@ -17,59 +17,18 @@
 
 import gocept.selenium.selenese
 
-SELENIUM_SERVER_HOST_KEY = 'GOCEPT_SELENIUM_SERVER_HOST'
-SELENIUM_SERVER_HOST_DEFAULT = 'localhost'
 
-SELENIUM_SERVER_PORT_KEY = 'GOCEPT_SELENIUM_SERVER_PORT'
-SELENIUM_SERVER_PORT_DEFAULT = '4444'
-
-BROWSER_KEY = 'GOCEPT_SELENIUM_BROWSER'
-BROWSER_DEFAULT = '*firefox'
-
-APP_HOST_KEY = 'GOCEPT_SELENIUM_APP_HOST'
-APP_HOST_DEFAULT = '0.0.0.0'
-
-APP_PORT_KEY = 'GOCEPT_SELENIUM_APP_PORT'
-
-SPEED_KEY = 'GOCEPT_SELENIUM_SPEED'
-
-
-def _selenium_server_host():
-    return os.environ.get(SELENIUM_SERVER_HOST_KEY,
-                          SELENIUM_SERVER_HOST_DEFAULT)
-
-
-def _selenium_server_port():
-    return int(os.environ.get(SELENIUM_SERVER_PORT_KEY,
-                              SELENIUM_SERVER_PORT_DEFAULT))
-
-
-def _browser():
-    return os.environ.get(BROWSER_KEY, BROWSER_DEFAULT)
-
-
-def _app_host():
-    return os.environ.get(APP_HOST_KEY, APP_HOST_DEFAULT)
-
-
-def _app_port():
-    return int(os.environ.get(APP_PORT_KEY, '5698'))
-
-
-def _speed():
-    return os.environ.get(SPEED_KEY)
-
-
 class Layer(object):
 
     # hostname and port of the Selenium RC server
-    _server = _selenium_server_host()
-    _port = _selenium_server_port()
-    _browser = _browser()
+    _server = os.environ.get('GOCEPT_SELENIUM_SERVER_HOST', 'localhost')
+    _port = int(os.environ.get('GOCEPT_SELENIUM_SERVER_PORT', 4444))
 
+    _browser = os.environ.get('GOCEPT_SELENIUM_BROWSER', '*firefox')
+
     # hostname and port of the local application.
-    host = _app_host()
-    port = _app_port()
+    host = os.environ.get('GOCEPT_SELENIUM_APP_HOST', 'localhost')
+    port = int(os.environ.get('GOCEPT_SELENIUM_APP_PORT', 5698))
 
     __name__ = 'Layer'
 
@@ -83,7 +42,7 @@
             self._server, self._port, self._browser,
             'http://%s:%s/' % (self.host, self.port))
         self.selenium.start()
-        speed = _speed()
+        speed = os.environ.get('GOCEPT_SELENIUM_SPEED')
         if speed is not None:
             self.selenium.set_speed(speed)