From b9150f1bf629b674b9c5c50fba98b743bd6e5459 Mon Sep 17 00:00:00 2001
From: calvin <calvin@e7d03fd6-7b0d-0410-9947-9c21f3af8025>
Date: Mon, 5 Jun 2006 20:21:01 +0000
Subject: [PATCH] fix blacklist file writing

git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@3356 e7d03fd6-7b0d-0410-9947-9c21f3af8025
---
 linkcheck/logger/blacklist.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/linkcheck/logger/blacklist.py b/linkcheck/logger/blacklist.py
index 7fb00d1e..7497c7c3 100644
--- a/linkcheck/logger/blacklist.py
+++ b/linkcheck/logger/blacklist.py
@@ -38,9 +38,8 @@ class BlacklistLogger (linkcheck.logger.Logger):
         super(BlacklistLogger, self).__init__(**args)
         self.init_fileoutput(args)
         self.blacklist = {}
-        if self.filename is not None:
-            if os.path.exists(self.filename):
-                self.read_blacklist(self.filename)
+        if self.filename is not None and os.path.exists(self.filename):
+            self.read_blacklist()
 
     def comment (self, s, **args):
         """
@@ -69,18 +68,20 @@ class BlacklistLogger (linkcheck.logger.Logger):
         """
         self.write_blacklist()
 
-    def read_blacklist (self, filename):
+    def read_blacklist (self):
         """
         Read a previously stored blacklist from file fd.
         """
-        fd = file(filename)
-        for line in fd:
-            line = line.rstrip()
-            if line.startswith('#') or not line:
-                continue
-            value, key = line.split(None, 1)
-            self.blacklist[key] = int(value)
-        fd.close()
+        fd = open(self.filename)
+        try:
+            for line in fd:
+                line = self.decode(line.rstrip())
+                if line.startswith('#') or not line:
+                    continue
+                value, key = line.split(None, 1)
+                self.blacklist[key] = int(value)
+        finally:
+            fd.close()
 
     def write_blacklist (self):
         """
@@ -88,8 +89,7 @@ class BlacklistLogger (linkcheck.logger.Logger):
         """
         oldmask = os.umask(0077)
         for key, value in self.blacklist.iteritems():
-            self.fd.write("%d %s" % (value, key))
-            self.fd.write(os.linesep)
+            self.write(u"%d %s%s" % (value, key, os.linesep))
         self.close_fileoutput()
         # restore umask
         os.umask(oldmask)