diff options
Diffstat (limited to 'libbe/storage/vcs/bzr.py')
| -rw-r--r-- | libbe/storage/vcs/bzr.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libbe/storage/vcs/bzr.py b/libbe/storage/vcs/bzr.py index 0c92058..6da299a 100644 --- a/libbe/storage/vcs/bzr.py +++ b/libbe/storage/vcs/bzr.py @@ -39,11 +39,11 @@ import os import os.path import re import shutil -import StringIO +import io import sys import libbe -import base +from . import base if libbe.TESTING == True: import doctest @@ -84,7 +84,7 @@ class Bzr(base.VCS): def _vcs_root(self, path): """Find the root of the deepest repository containing path.""" cmd = bzrlib.builtins.cmd_root() - cmd.outf = StringIO.StringIO() + cmd.outf = io.StringIO() cmd.run(filename=path) if self.version_cmp(2,2,0) < 0: cmd.cleanup_now() @@ -92,7 +92,7 @@ class Bzr(base.VCS): def _vcs_init(self, path): cmd = bzrlib.builtins.cmd_init() - cmd.outf = StringIO.StringIO() + cmd.outf = io.StringIO() cmd.run(location=path) if self.version_cmp(2,2,0) < 0: cmd.cleanup_now() @@ -105,7 +105,7 @@ class Bzr(base.VCS): def _vcs_add(self, path): path = os.path.join(self.repo, path) cmd = bzrlib.builtins.cmd_add() - cmd.outf = StringIO.StringIO() + cmd.outf = io.StringIO() kwargs = {'file_ids_from': self.repo} if self.repo == os.path.realpath(os.getcwd()): # Work around bzr file locking on Windows. @@ -126,7 +126,7 @@ class Bzr(base.VCS): # --force to also remove unversioned files. path = os.path.join(self.repo, path) cmd = bzrlib.builtins.cmd_remove() - cmd.outf = StringIO.StringIO() + cmd.outf = io.StringIO() cmd.run(file_list=[path], file_deletion_strategy='force') if self.version_cmp(2,2,0) < 0: cmd.cleanup_now() @@ -150,14 +150,14 @@ class Bzr(base.VCS): path = os.path.join(self.repo, path) revision = self._parse_revision_string(revision) cmd = bzrlib.builtins.cmd_cat() - cmd.outf = StringIO.StringIO() + cmd.outf = io.StringIO() if self.version_cmp(1,6,0) < 0: # old bzrlib cmd_cat uses sys.stdout not self.outf for output. stdout = sys.stdout sys.stdout = cmd.outf try: cmd.run(filename=path, revision=revision) - except bzrlib.errors.BzrCommandError, e: + except bzrlib.errors.BzrCommandError as e: if 'not present in revision' in str(e): raise base.InvalidPath(path, root=self.repo, revision=revision) raise @@ -177,7 +177,7 @@ class Bzr(base.VCS): def _vcs_isdir(self, path, revision): try: self._vcs_listdir(path, revision) - except AttributeError, e: + except AttributeError as e: if 'children' in str(e): return False raise @@ -187,7 +187,7 @@ class Bzr(base.VCS): path = os.path.join(self.repo, path) revision = self._parse_revision_string(revision) cmd = bzrlib.builtins.cmd_ls() - cmd.outf = StringIO.StringIO() + cmd.outf = io.StringIO() try: if self.version_cmp(2,0,0) >= 0: cmd.run(revision=revision, path=path, recursive=recursive) @@ -197,7 +197,7 @@ class Bzr(base.VCS): # (https://bugs.launchpad.net/bzr/+bug/158690) cmd.run(revision=revision, path=path, non_recursive=False) - except bzrlib.errors.BzrCommandError, e: + except bzrlib.errors.BzrCommandError as e: if 'not present in revision' in str(e): raise base.InvalidPath(path, root=self.repo, revision=revision) raise @@ -212,12 +212,12 @@ class Bzr(base.VCS): def _vcs_commit(self, commitfile, allow_empty=False): cmd = bzrlib.builtins.cmd_commit() - cmd.outf = StringIO.StringIO() + cmd.outf = io.StringIO() cwd = os.getcwd() os.chdir(self.repo) try: cmd.run(file=commitfile, unchanged=allow_empty) - except bzrlib.errors.BzrCommandError, e: + except bzrlib.errors.BzrCommandError as e: strings = ['no changes to commit.', # bzr 1.3.1 'No changes to commit.'] # bzr 1.15.1 if self._u_any_in_string(strings, str(e)) == True: @@ -231,7 +231,7 @@ class Bzr(base.VCS): def _vcs_revision_id(self, index): cmd = bzrlib.builtins.cmd_revno() - cmd.outf = StringIO.StringIO() + cmd.outf = io.StringIO() cmd.run(location=self.repo) if self.version_cmp(2,2,0) < 0: cmd.cleanup_now() @@ -245,7 +245,7 @@ class Bzr(base.VCS): def _diff(self, revision): revision = self._parse_revision_string(revision) cmd = bzrlib.builtins.cmd_diff() - cmd.outf = StringIO.StringIO() + cmd.outf = io.StringIO() # for some reason, cmd_diff uses sys.stdout not self.outf for output. stdout = sys.stdout sys.stdout = cmd.outf |