diff --git a/hgext/shelve.py b/hgext/shelve.py
index 7b216d4a7d..c9b4489b09 100644
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -149,7 +149,7 @@ def createcmd(ui, repo, pats, opts):
     label = repo._bookmarkcurrent or parent.branch() or 'default'
 
     # slashes aren't allowed in filenames, therefore we rename it
-    origlabel, label = label, label.replace('/', '_')
+    label = label.replace('/', '_')
 
     def gennames():
         yield label
diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
index 11e817b9ae..87d7fbd92a 100644
--- a/mercurial/changegroup.py
+++ b/mercurial/changegroup.py
@@ -360,7 +360,7 @@ class bundle10(object):
 
         def linknodes(filerevlog, fname):
             if fastpathlinkrev:
-                ln, llr = filerevlog.node, filerevlog.linkrev
+                llr = filerevlog.linkrev
                 def genfilenodes():
                     for r in filerevlog:
                         linkrev = llr(r)
diff --git a/tests/test-pathencode.py b/tests/test-pathencode.py
index b9522df2cb..ed741fd133 100644
--- a/tests/test-pathencode.py
+++ b/tests/test-pathencode.py
@@ -143,7 +143,6 @@ def genpath(rng, count):
 
     mink, maxk = 1, 4096
     def steps():
-        x, k = 0, mink
         for i in xrange(count):
             yield mink + int(round(math.sqrt((maxk - mink) * float(i) / count)))
     for k in steps():