diff options
| -rw-r--r-- | b4/__init__.py | 1 | ||||
| -rw-r--r-- | b4/pr.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/b4/__init__.py b/b4/__init__.py index acb3125..ca1bf60 100644 --- a/b4/__init__.py +++ b/b4/__init__.py @@ -11,6 +11,7 @@ import os import fnmatch import email.utils import email.policy +import email.header import requests import urllib.parse import datetime @@ -13,7 +13,7 @@ import mailbox from datetime import timedelta from tempfile import mkstemp -from email import utils, charset, header +from email import utils, charset charset.add_charset('utf-8', None) @@ -129,7 +129,6 @@ def attest_fetch_head(gitdir, lmsg): attfail = b4.FAIL_SIMPLE # Is FETCH_HEAD a tag or a commit? htype = b4.git_get_command_lines(gitdir, ['cat-file', '-t', 'FETCH_HEAD']) - lsig = None passing = False out = '' otype = 'unknown' @@ -224,7 +223,6 @@ def explode(gitdir, lmsg, savefile): # Fix From lines to make sure this is a valid mboxo out = re.sub(r'^From (?![a-f0-9]+ \w+ \w+ \d+ \d+:\d+:\d+ \d+$)', '>From ', out, 0, re.M) - print(out) # Save patches into a temporary file patchmbx = mkstemp()[1] |