[Checkins] SVN: lovely.buildouthttp/trunk/src/lovely/buildouthttp/buildouthttp.py fix a windows test failure

[Adam Groszer]

Log message for revision 116762:
  fix a windows test failure

Changed:
  U   lovely.buildouthttp/trunk/src/lovely/buildouthttp/buildouthttp.py

-=-
Modified: lovely.buildouthttp/trunk/src/lovely/buildouthttp/buildouthttp.py
===================================================================
--- lovely.buildouthttp/trunk/src/lovely/buildouthttp/buildouthttp.py	2010-09-23 11:06:12 UTC (rev 116761)
+++ lovely.buildouthttp/trunk/src/lovely/buildouthttp/buildouthttp.py	2010-09-23 11:49:54 UTC (rev 116762)
@@ -147,34 +147,37 @@
         return
 
 
-    reader = csv.reader(pwdsf)
-    auth_handler = CredHandler()
-    github_creds = get_github_credentials()
-    new_handlers = []
-    if github_creds:
-        new_handlers.append(GithubHandler(*github_creds))
+    try:
+        reader = csv.reader(pwdsf)
+        auth_handler = CredHandler()
+        github_creds = get_github_credentials()
+        new_handlers = []
+        if github_creds:
+            new_handlers.append(GithubHandler(*github_creds))
 
-    creds = []
-    for l, row in enumerate(reader):
-        if len(row) != 4:
-            raise RuntimeError(
-                "Authentication file cannot be parsed %s:%s" % (
-                    pwd_path, l+1))
-        realm, uris, user, password = (el.strip() for el in row)
-        creds.append((realm, uris, user, password))
-        log.debug('Added credentials %r, %r' % (realm, uris))
-        auth_handler.add_password(realm, uris, user, password)
-    if creds:
-        new_handlers.append(auth_handler)
-        download.url_opener = URLOpener(creds)
-    if new_handlers:
-        if urllib2._opener is not None:
-            handlers = urllib2._opener.handlers[:]
-            handlers[:0] = new_handlers
-        else:
-            handlers = new_handlers
-        opener = urllib2.build_opener(*handlers)
-        urllib2.install_opener(opener)
+        creds = []
+        for l, row in enumerate(reader):
+            if len(row) != 4:
+                raise RuntimeError(
+                    "Authentication file cannot be parsed %s:%s" % (
+                        pwd_path, l+1))
+            realm, uris, user, password = (el.strip() for el in row)
+            creds.append((realm, uris, user, password))
+            log.debug('Added credentials %r, %r' % (realm, uris))
+            auth_handler.add_password(realm, uris, user, password)
+        if creds:
+            new_handlers.append(auth_handler)
+            download.url_opener = URLOpener(creds)
+        if new_handlers:
+            if urllib2._opener is not None:
+                handlers = urllib2._opener.handlers[:]
+                handlers[:0] = new_handlers
+            else:
+                handlers = new_handlers
+            opener = urllib2.build_opener(*handlers)
+            urllib2.install_opener(opener)
+    finally:
+        pwdsf.close()
 
 class URLOpener(download.URLOpener):