You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2021/05/14 22:02:34 UTC

[incubator-ponymail-foal] branch master updated (51cd0cf -> c7d3fde)

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git.


    from 51cd0cf  Pylint fixes
     new 8ebe248  Revert "Use raw strings for RE"
     new c7d3fde  Revert "Use raw strings for RE"

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 tools/import-mbox.py            | 4 ++--
 tools/plugins/generators_old.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[incubator-ponymail-foal] 02/02: Revert "Use raw strings for RE"

Posted by se...@apache.org.
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-foal.git

commit c7d3fde0c7e29056fc7e5dd698bc4ac4dfbda8d6
Author: Sebb <se...@apache.org>
AuthorDate: Fri May 14 23:01:43 2021 +0100

    Revert "Use raw strings for RE"
    
    This reverts commit 13eedb0c1438e50eec36f251070795cb4ef83d0e.
---
 tools/import-mbox.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/import-mbox.py b/tools/import-mbox.py
index 743fc5f..66b7a82 100755
--- a/tools/import-mbox.py
+++ b/tools/import-mbox.py
@@ -739,8 +739,8 @@ elif re.match(r"imaps?://", source):
     results = imap4.uid("fetch", uids, "(BODY[HEADER.FIELDS (MESSAGE-ID)])")
 
     mail = {}
-    uid_re = re.compile(r"^\d+ \(UID (\d+) BODY\[")
-    mid_re = re.compile(r"^Message-ID:\s*(.*?)\s*$", re.I)
+    uid_re = re.compile(b"^\d+ \(UID (\d+) BODY\[")
+    mid_re = re.compile(b"^Message-ID:\s*(.*?)\s*$", re.I)
     uid = None
     for result in results[1]:
         for line in result:

[incubator-ponymail-foal] 01/02: Revert "Use raw strings for RE"

Posted by se...@apache.org.
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-foal.git

commit 8ebe248d9de727149ab0aceea7193399cf2413d7
Author: Sebb <se...@apache.org>
AuthorDate: Fri May 14 23:00:43 2021 +0100

    Revert "Use raw strings for RE"
    
    This reverts commit 9aeb9ca60f86005edf7ce1ed9ad09a164e2bd5b1.
---
 tools/plugins/generators_old.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/plugins/generators_old.py b/tools/plugins/generators_old.py
index 393eb5d..a48663c 100644
--- a/tools/plugins/generators_old.py
+++ b/tools/plugins/generators_old.py
@@ -123,7 +123,7 @@ def cluster(msg, body, lid, attachments, _raw_msg):
     xbody = body if type(body) is bytes else body.encode('utf-8', errors='ignore')
 
     # Crop out any trailing whitespace in body
-    xbody = re.sub(r"\s+$", b"", xbody)
+    xbody = re.sub(b"\s+$", b"", xbody)
 
     # Use Message-Id (or '' if missing)
     xbody += bytes(msg.get('message-id', ''), encoding='ascii')