diff --git a/cmdutil.py b/cmdutil.py
index c70c81f27c..ecb5408fa9 100644
--- a/cmdutil.py
+++ b/cmdutil.py
@@ -7,11 +7,7 @@ import svnwrap
 import svnexternals
 
 
-class BaseException(Exception):
-    pass
-
-
-class NoFilesException(BaseException):
+class NoFilesException(Exception):
     """Exception raised when you try and commit without files.
     """
 
@@ -128,7 +124,7 @@ def _externals(ctx):
     return ext
 
 
-def commit_from_rev(ui, repo, rev_ctx, hg_editor, svn_url, base_revision
+def commit_from_rev(ui, repo, rev_ctx, hg_editor, svn_url, base_revision,
                     username, password):
     """Build and send a commit from Mercurial to Subversion.
     """
diff --git a/svncommand.py b/svncommand.py
index 08795fcc7d..70bd0e6725 100644
--- a/svncommand.py
+++ b/svncommand.py
@@ -1,12 +1,10 @@
 import os
-import stat
 import sys
 import traceback
 
 from mercurial import hg
 from mercurial import node
 
-import svnwrap
 import util
 from util import register_subcommand, svn_subcommands, generate_help, svn_commands_nourl
 # dirty trick to force demandimport to run my decorator anyway.