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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2009-09-10 21:53:10 +0200 (Thu, 10 Sep 2009)
New Revision: 195

Modified:
   trunk/ChangeLog
   trunk/inteproxy/config.py
Log:
* inteproxy/config.py (read_config): Minor cleanups


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-10 19:28:04 UTC (rev 194)
+++ trunk/ChangeLog	2009-09-10 19:53:10 UTC (rev 195)
@@ -1,5 +1,9 @@
 2009-09-10  Bernhard Herzog  <bh at intevation.de>
 
+	* inteproxy/config.py (read_config): Minor cleanups
+
+2009-09-10  Bernhard Herzog  <bh at intevation.de>
+
 	* inteproxy/config.py (HostEntry, InteProxyRule): Replace
 	HostEntry with the more elaborate class InteProxyRule which can
 	handle more parts of an url

Modified: trunk/inteproxy/config.py
===================================================================
--- trunk/inteproxy/config.py	2009-09-10 19:28:04 UTC (rev 194)
+++ trunk/inteproxy/config.py	2009-09-10 19:53:10 UTC (rev 195)
@@ -138,9 +138,6 @@
     parser = SafeConfigParser()
     parser.read([filename])
 
-    remote_hosts = []
-    config = None
-
     sections = set(parser.sections())
     config = read_config_section(parser, "inteproxy", inteproxy_desc)
     sections.discard("inteproxy")
@@ -161,6 +158,7 @@
             if url:
                 config.hosts.append(parse_inteproxy_url(url))
 
+    # handle old host sections
     for section in sections:
         config.hosts.append(read_config_section(parser, section, host_desc,
                                                 settings_class=InteProxyRule))