# HG changeset patch
# User Sune Foldager <cryo@cyanite.org>
# Date 1304530075 -7200
# Node ID 4ab6e2d597cca476a3aab865620ec946dd307972
# Parent  333def42e785fddda47dd097c0648abb105e399a
fix errors reported by pyflakes test

diff -r 333def42e785 -r 4ab6e2d597cc mercurial/discovery.py
--- a/mercurial/discovery.py	Wed May 04 08:21:50 2011 -0500
+++ b/mercurial/discovery.py	Wed May 04 19:27:55 2011 +0200
@@ -7,7 +7,7 @@
 
 from node import nullid, short
 from i18n import _
-import util, error, setdiscovery, treediscovery
+import util, setdiscovery, treediscovery
 
 def findcommonincoming(repo, remote, heads=None, force=False):
     """Return a tuple (common, anyincoming, heads) used to identify the common
diff -r 333def42e785 -r 4ab6e2d597cc mercurial/localrepo.py
--- a/mercurial/localrepo.py	Wed May 04 08:21:50 2011 -0500
+++ b/mercurial/localrepo.py	Wed May 04 19:27:55 2011 +0200
@@ -661,7 +661,7 @@
         if 'l' in flags:
             self.wopener.symlink(data, filename)
         else:
-            fp = self.wopener.write(filename, data)
+            self.wopener.write(filename, data)
             if 'x' in flags:
                 util.set_flags(self.wjoin(filename), False, True)