Merge pull request #947 from efiop/master

dvc: fix errors found by flake8

dvc/command/destroy.py

@@ -13,7 +13,7 @@ class CmdDestroy(CmdBase):
             if not self.args.force and not prompt(msg, False):
                 msg = u'Cannot destroy without a confirmation from the user. ' \
                       u'Use \'-f\' to force.'
-                raise DvcException(err)
+                raise DvcException(msg)
 
             self.project.destroy()
         except Exception as exc:

dvc/remote/gs.py

@@ -16,6 +16,7 @@ from dvc.remote.base import RemoteBase
 from dvc.remote.local import RemoteLOCAL
 from dvc.config import Config
 from dvc.progress import progress
+from dvc.exceptions import DvcException
 
 
 class RemoteGS(RemoteBase):

dvc/scm.py

@@ -53,6 +53,7 @@ class Base(object):
         if not branches:
             branches = self.list_branches() if all_branches else [saved]
         for branch in branches:
+            print("OLOLO " + branch)
             self.checkout(branch)
             yield branch
         self.checkout(saved)
@@ -81,6 +82,7 @@ class Git(Base):
         super(Git, self).__init__(root_dir)
 
         import git
+        from git.exc import InvalidGitRepositoryError
         try:
             self.repo = git.Repo(root_dir)
         except InvalidGitRepositoryError: