/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/vcs/bzr.py

  • Committer: Tim Marston
  • Date: 2021-07-05 19:14:32 UTC
  • Revision ID: tim@ed.am-20210705191432-243ayb7s2nmussvi
python3ification

Show diffs side-by-side

added added

removed removed

lib/stdhome/vcs/bzr.py
21
21
 
22
22
import subprocess, os, re, shutil
23
23
from subprocess import Popen
24
 
import StringIO
25
 
from vcs import Vcs
 
24
import io
 
25
from .vcs import Vcs
26
26
from stdhome import the
27
27
 
28
28
 
105
105
                output = self.run( [ 'bzr', 'revno', '--tree' ] )
106
106
 
107
107
                # parse revno
108
 
                buf = StringIO.StringIO( output )
 
108
                buf = io.StringIO( output )
109
109
                return buf.readline().rstrip()
110
110
 
111
111
 
129
129
                                        raise RunTimeError(
130
130
                                                'failed to parse bzr kind change: %s' % file )
131
131
                                file = matches.group( 1 )
132
 
                                if the.verbose >= 2: print "removing (kind changed): " + file
 
132
                                if the.verbose >= 2: print("removing (kind changed): " + file)
133
133
                                full_file = os.path.join( self.dir, file )
134
134
                                if os.path.isfile( full_file ) or os.path.islink( full_file ):
135
135
                                        os.unlink( full_file )
153
153
                                        raise RunTimeError(
154
154
                                                'failed to parse bzr unknowns: %s' % file )
155
155
                                file = matches.group( 1 )
156
 
                                if the.verbose >= 2: print "removing (unknown): " + file
 
156
                                if the.verbose >= 2: print("removing (unknown): " + file)
157
157
                                full_file = os.path.join( self.dir, file )
158
158
                                if os.path.isfile( full_file ) or os.path.islink( full_file ):
159
159
                                        os.unlink( full_file )
219
219
 
220
220
                # parse output (see logic in report() in bzrlib/delta.py)
221
221
                files = list()
222
 
                buf = StringIO.StringIO( output )
 
222
                buf = io.StringIO( output )
223
223
                for line in buf:
224
224
                        if not re.search( '^[-R+ ?][K NMD!][* ] ', line ): continue
225
225
                        line = line.rstrip()
299
299
 
300
300
 
301
301
        def run( self, cmd ):
302
 
                if the.verbose >= 2: print 'exec: %s' % ' '.join( cmd )
 
302
                if the.verbose >= 2: print('exec: %s' % ' '.join( cmd ))
303
303
                p = Popen( cmd, cwd = self.dir,
304
304
                                   stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
305
 
                output = p.communicate()[ 0 ]
 
305
                output = p.communicate()[ 0 ].decode()
306
306
                if p.returncode > 0:
307
307
                        raise self.VcsError( ' '.join( cmd[ : 2 ] ), output )
308
308
                if the.verbose >= 2:
309
309
                        verbose_output = output.rstrip()
310
310
                        if len( verbose_output ):
311
 
                                print re.sub( '(^|\n)', '\\1  : ', verbose_output )
 
311
                                print(re.sub( '(^|\n)', '\\1  : ', verbose_output ))
312
312
                return output
313
313
 
314
314
 
315
315
        def parse_file_blocks( self, output ):
316
316
                res = dict()
317
317
                current = None
318
 
                buf = StringIO.StringIO( output )
 
318
                buf = io.StringIO( output )
319
319
                for line in buf:
320
320
                        matches = re.search( '^([a-z ]+):$', line, re.I )
321
321
                        if matches: