This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail.git
The following commit(s) were added to refs/heads/master by this push:
new c16f14a unused
c16f14a is described below
commit c16f14a029ff0175e9bd4244cfea242a9e3db9e8
Author: Sebb <[email protected]>
AuthorDate: Mon Aug 17 10:56:20 2020 +0100
unused
---
tools/archiver.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/tools/archiver.py b/tools/archiver.py
index ad6aed1..d47f3f7 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -64,7 +64,6 @@ import netaddr
from ponymailconfig import PonymailConfig
import generators
-import urllib.parse
ES_MAJOR = ES_VERSION[0]
@@ -333,10 +332,10 @@ class Archiver(object): # N.B. Also used by import-mbox.py
body = convertToWrapped(body, character_set="utf-8")
if isinstance(body, str):
body = body.encode('utf-8')
- except Exception as err:
+ except Exception:
try:
body = body.decode(chardet.detect(body)['encoding'])
- except Exception as err:
+ except Exception:
try:
body = body.decode('latin-1')
except:
@@ -626,7 +625,6 @@ def main():
print("STDIN parser exception: %s" % err)
# We're reading from STDIN, so let's fake an MM3 call
- ispublic = True
if args.altheader:
alt_header = args.altheader[0]