stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
- (output, errors) = cmd.communicate(self._contents.encode('utf-8'))
+ (output, errors) = cmd.communicate(self._contents.encode())
if cmd.returncode:
raise ParseChangeLogError("Failed to parse changelog. "
"dpkg-parsechangelog said:\n%s" % errors.decode().strip())
# Parse the result of dpkg-parsechangelog (which looks like
# email headers)
+ output = output.decode()
cp = email.message_from_string(output)
try:
if ':' in cp['Version']:
@param cwd: directory to swith to when running the command, defaults to I{self.path}
@type cwd: C{str}
@return: stdout, return code
- @rtype: C{tuple} of C{list} of C{str} and C{int}
+ @rtype: C{tuple} of C{list} of C{bytestr} and C{int}
@deprecated: use L{gbp.git.repository.GitRepository._git_inout} instead.
"""
@param capture_stderr: whether to capture stderr
@type capture_stderr: C{bool}
@return: stdout, stderr, return code
- @rtype: C{tuple} of C{str}, C{str}, C{int}
+ @rtype: C{tuple} of C{bytestr}, C{bytestr}, C{int}
"""
if not cwd:
cwd = self.path
# Expect to have two filenames for renames and copies
if status[0] in ['R', 'C']:
filepath = elements.pop(0) + b'\x00' + filepath
- result[status].append(filepath)
+ result[status].append(filepath.decode())
return result
while len(file_fields) and file_fields[0] != b'':
status = file_fields.pop(0).decode().strip()
path = file_fields.pop(0)
- files[status].append(path)
+ files[status].append(path.decode())
return {'id': commitish,
'author': author,
if status in ['R', 'C']:
result[status].append(filepath)
filepath = elements.pop(0)
- result[status].append(filepath)
+ result[status].append(filepath.decode())
return result
#}
"""
topdir_files = set()
for typ, path in file_list:
- #path is byte type, not str.
- path = path.decode()
split = re.sub('^(?:./|../)*', '', path).split('/')
if len(split) == 1:
topdir_files.add((typ, path))
raise GbpError("Listing tar archive content failed")
for line in out.splitlines():
fields = line.split(None, 5)
- files.append((fields[0][0], fields[-1]))
+ files.append((fields[0][0], fields[-1].decode()))
else:
raise GbpError("Unsupported archive format %s, unable to "
"determine prefix for '%s'" %
indent_re = re.compile(r'^([a-z]+([0-9]+)?\s*:\s*)', flags=re.I)
match = indent_re.match(str(insertafter))
if not match:
- match = indent_re.match(str(insertafter.__next__))
+ match = indent_re.match(str(insertafter.next))
indent = 12 if not match else len(match.group(1))
text = '%-*s%s\n' % (indent, '%s:' % tagname, value)
if key in self._tags:
"which to update" % name)
line = self._special_directives[name][0]['line']
gbp.log.debug("Removing content of %s section" % name)
- while line.__next__:
- match = self.directive_re.match(str(line.__next__))
+ while line.next:
+ match = self.directive_re.match(str(line.next))
if match and match.group('name') in self.section_identifiers:
break
- self._content.delete(line.__next__)
+ self._content.delete(line.next)
else:
gbp.log.debug("Adding %s section to the end of spec file" % name)
line = self._content.append('%%%s\n' % name)
text = ''
if 'changelog' in self._special_directives:
line = self._special_directives['changelog'][0]['line']
- while line.__next__:
- line = line.__next__
+ while line.next:
+ line = line.next
match = self.directive_re.match(str(line))
if match and match.group('name') in self.section_identifiers:
break
if not macro['id'] in ignored:
macro_prev = self._delete_special_macro('patch', macro['id'])
# Remove surrounding if-else
- macro_next = macro_prev.__next__
+ macro_next = macro_prev.next
if (str(macro_prev).startswith('%if') and
str(macro_next).startswith('%endif')):
self._content.delete(macro_next)
if recursive:
paths = ''
else:
- paths = ["'%s'" % nam.decode() for _mod, typ, _sha, nam in
+ paths = ['%s' % nam.decode() for _mod, typ, _sha, nam in
repo.list_tree(treeish) if typ == 'blob']
try:
from email.message import Message
from email.header import Header
from email.charset import Charset, QP
+from email.policy import Compat32
from gbp.git import GitRepositoryError
from gbp.git.modifier import GitModifier, GitTz
include_paths = []
for file_list in list(file_status.values()):
for fname in file_list:
- fname = fname.decode()
if not re.match(exclude_regex, fname):
include_paths.append(fname)
else:
# Git compat: put name in quotes if special characters found
if re.search("[,.@()\[\]\\\:;]", name):
name = '"%s"' % name
- from_header = Header(name.encode('utf-8'), charset, 77, 'from')
- from_header.append(email.encode('utf-8'))
+ from_header = Header(header_name='from')
+ try:
+ from_header.append(name, 'us-ascii')
+ except UnicodeDecodeError:
+ from_header.append(name, charset)
+ from_header.append('<%s>' % email)
msg['From'] = from_header
date = commit_info['author'].datetime
datestr = date.strftime('%a, %-d %b %Y %H:%M:%S %z')
- msg['Date'] = Header(datestr.encode('utf-8'), charset, 77, 'date')
- msg['Subject'] = Header(commit_info['subject'].encode('utf-8'),
- charset, 77, 'subject')
+ msg['Date'] = Header(datestr, 'us-ascii', 'date')
+ subject_header = Header(header_name='subject')
+ try:
+ subject_header.append(commit_info['subject'], 'us-ascii')
+ except UnicodeDecodeError:
+ subject_header.append(commit_info['subject'], charset)
+ msg['Subject'] = subject_header
# Write message body
if commit_info['body']:
# Strip extra linefeeds
body = commit_info['body'].rstrip() + '\n'
try:
- msg.set_payload(body.encode('ascii'))
- except UnicodeDecodeError:
+ msg.set_payload(body.encode('us-ascii'))
+ except UnicodeEncodeError:
msg.set_payload(body, charset)
- patch.write(msg.as_string(unixfrom=False).encode('utf-8'))
-
+ policy = Compat32(max_line_length=77)
+ patch.write(msg.as_bytes(unixfrom=False, policy=policy))
# Write diff
patch.write(b'---\n')
- patch.write(diff.encode())
+ patch.write(diff)
except IOError as err:
raise GbpError('Unable to create patch file: %s' % err)
return filename
projects / tools / git-buildpackage.git / commitdiff