fix coding style (reported by pylint)

hgext/convert/bzr.py

@@ -170,7 +170,7 b' class bzr_source(converter_source):'
         return changes
 
     def _gettreechanges(self, current, origin):
-        revid = current._revision_id;
+        revid = current._revision_id
         changes = []
         renames = {}
         for (fileid, paths, changed_content, versioned, parent, name,

hgext/convert/gnuarch.py

@@ -172,7 +172,7 b' class gnuarch_source(converter_source, c'
 
         for src in self.changes[rev].ren_dirs:
             to = self.changes[rev].ren_dirs[src]
-            chgs, cps = self._rendirchanges(src, to);
+            chgs, cps = self._rendirchanges(src, to)
             changes += [(f, rev) for f in chgs]
             copies.update(cps)
 

hgext/hgk.py

@@ -92,7 +92,7 b' def difftree(ui, repo, node1=None, node2'
             break
 
 def catcommit(ui, repo, n, prefix, ctx=None):
-    nlprefix = '\n' + prefix;
+    nlprefix = '\n' + prefix
     if ctx is None:
         ctx = repo[n]
     ui.write("tree %s\n" % short(ctx.changeset()[0])) # use ctx.node() instead ??
@@ -135,7 +135,7 b' def catfile(ui, repo, type=None, r=None,'
     prefix = ""
     if opts['stdin']:
         try:
-            (type, r) = raw_input().split(' ');
+            (type, r) = raw_input().split(' ')
             prefix = "    "
         except EOFError:
             return
@@ -148,12 +148,12 b' def catfile(ui, repo, type=None, r=None,'
     while r:
         if type != "commit":
             ui.warn(_("aborting hg cat-file only understands commits\n"))
-            return 1;
+            return 1
         n = repo.lookup(r)
         catcommit(ui, repo, n, prefix)
         if opts['stdin']:
             try:
-                (type, r) = raw_input().split(' ');
+                (type, r) = raw_input().split(' ')
             except EOFError:
                 break
         else:
@@ -220,8 +220,8 b' def revtree(ui, args, repo, full="tree",'
 
     # calculate the graph for the supplied commits
     for i, n in enumerate(want_sha1):
-        reachable.append(set());
-        visit = [n];
+        reachable.append(set())
+        visit = [n]
         reachable[i].add(n)
         while visit:
             n = visit.pop(0)

hgext/highlight/highlight.py

@@ -9,7 +9,7 b''
 # file to defer pygments loading and speedup extension setup.
 
 from mercurial import demandimport
-demandimport.ignore.extend(['pkgutil', 'pkg_resources', '__main__',])
+demandimport.ignore.extend(['pkgutil', 'pkg_resources', '__main__'])
 from mercurial import util, encoding
 
 from pygments import highlight

mercurial/commands.py

@@ -103,7 +103,7 b' def annotate(ui, repo, *pats, **opts):'
         opts['number'] = 1
 
     linenumber = opts.get('line_number') is not None
-    if (linenumber and (not opts.get('changeset')) and (not opts.get('number'))):
+    if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
         raise util.Abort(_('at least one of -n/-c is required for -l'))
 
     funcmap = [func for op, func in opmap if opts.get(op)]

mercurial/dirstate.py

@@ -366,7 +366,7 b' class dirstate(object):'
     def clear(self):
         self._map = {}
         if "_dirs" in self.__dict__:
-            delattr(self, "_dirs");
+            delattr(self, "_dirs")
         self._copymap = {}
         self._pl = [nullid, nullid]
         self._dirty = True

mercurial/hgweb/webcommands.py

@@ -707,7 +707,7 b' def graph(web, req, tmpl):'
 
     dag = graphmod.revisions(web.repo, rev, downrev)
     tree = list(graphmod.colored(dag))
-    canvasheight = (len(tree) + 1) * bg_height - 27;
+    canvasheight = (len(tree) + 1) * bg_height - 27
     data = []
     for (id, type, ctx, vtx, edges) in tree:
         if type != graphmod.CHANGESET:

mercurial/windows.py

@@ -41,7 +41,7 b' class winstdout(object):'
             limit = 16000
             l = len(s)
             start = 0
-            self.softspace = 0;
+            self.softspace = 0
             while start < l:
                 end = start + limit
                 self.fp.write(s[start:end])
@@ -217,7 +217,6 b' def statfiles(files):'
     '''Stat each file in files and yield stat or None if file does not exist.
     Cluster and cache stat per directory to minimize number of OS stat calls.'''
     ncase = os.path.normcase
-    sep   = os.sep
     dircache = {} # dirname -> filename -> status | None if file does not exist
     for nf in files:
         nf  = ncase(nf)