Fix typos/imports

devflow/autopkg.py

@@ -39,7 +39,6 @@ import sys
 from git import GitCommandError
 from optparse import OptionParser
 from sh import mktemp, cd, rm, git_dch  # pylint: disable=E0611
-from configobj import ConfigObj
 
 from devflow import versioning
 from devflow import utils

devflow/utils.py

@@ -127,7 +127,7 @@ def _get_branch(branch):
         return branch
     origin_branch = "origin/" + branch
     if origin_branch in repo.refs:
-        print "Creating branch '%s' to track '%s'" (branch, origin_branch)
+        print "Creating branch '%s' to track '%s'" % (branch, origin_branch)
         repo.git.branch(branch, origin_branch)
         return branch
     else:

devflow/versioning.py

@@ -48,7 +48,7 @@ import pprint
 
 from distutils import log  # pylint: disable=E0611
 
-from devflow import BRANCH_TYPES, BASE_VERSION_FILE
+from devflow import BRANCH_TYPES, BASE_VERSION_FILE, VERSION_RE
 from devflow import utils