fix errors reported by pyflakes test

mercurial/discovery.py

@@ -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

mercurial/localrepo.py

@@ -661,7 +661,7 class localrepository(repo.repository):
         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)