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 2017/01/04 14:55:59 UTC
incubator-ponymail git commit: many python scripts insist on Python
3.4
Repository: incubator-ponymail
Updated Branches:
refs/heads/master 2bb5b9722 -> 18839d5e6
many python scripts insist on Python 3.4
This fixes #312
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/18839d5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/18839d5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/18839d5e
Branch: refs/heads/master
Commit: 18839d5e664dea3c572f4a40b84ffca7c062fde2
Parents: 2bb5b97
Author: Sebb <se...@apache.org>
Authored: Wed Jan 4 14:55:27 2017 +0000
Committer: Sebb <se...@apache.org>
Committed: Wed Jan 4 14:55:27 2017 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
tools/archiver.py | 4 ++--
tools/copy-list.py | 2 +-
tools/edit-list.py | 2 +-
tools/elastic.py | 2 +-
tools/email_utils_patch.py | 2 +-
tools/feedwrapper.py | 8 ++++----
tools/import-mbox.py | 2 +-
tools/ll.py | 2 +-
tools/missing.py | 2 +-
tools/trace.py | 2 +-
11 files changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/18839d5e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20ddb31..bf69d13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -97,6 +97,7 @@
- Removed support for Mozilla Persona
- elastic.scroll does not return nil sid when there are no more results (#315)
- stats.lua should return firstMonth and lastMonth (#120)
+- many python scripts insist on Python 3.4 (#312)
## CHANGES in 0.9b:
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/18839d5e/tools/archiver.py
----------------------------------------------------------------------
diff --git a/tools/archiver.py b/tools/archiver.py
index 46e3130..b7af736 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.4
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -33,7 +33,7 @@ plugin: true
OR, to use the STDIN version (non-MM3 mailing list managers),
sub someone to the list(s) and add this to their .forward file:
-"|/usr/bin/env python3.4 /path/to/archiver.py"
+"|/usr/bin/env python3 /path/to/archiver.py"
"""
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/18839d5e/tools/copy-list.py
----------------------------------------------------------------------
diff --git a/tools/copy-list.py b/tools/copy-list.py
index 6ccfd25..6518528 100755
--- a/tools/copy-list.py
+++ b/tools/copy-list.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.4
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/18839d5e/tools/edit-list.py
----------------------------------------------------------------------
diff --git a/tools/edit-list.py b/tools/edit-list.py
index 35f7c9a..748a09a 100755
--- a/tools/edit-list.py
+++ b/tools/edit-list.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.4
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/18839d5e/tools/elastic.py
----------------------------------------------------------------------
diff --git a/tools/elastic.py b/tools/elastic.py
index c5ce4ed..adbd64b 100755
--- a/tools/elastic.py
+++ b/tools/elastic.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.4
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/18839d5e/tools/email_utils_patch.py
----------------------------------------------------------------------
diff --git a/tools/email_utils_patch.py b/tools/email_utils_patch.py
index 5cb7566..1cb4a71 100644
--- a/tools/email_utils_patch.py
+++ b/tools/email_utils_patch.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.4
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/18839d5e/tools/feedwrapper.py
----------------------------------------------------------------------
diff --git a/tools/feedwrapper.py b/tools/feedwrapper.py
index 3ace22d..18bc4ce 100755
--- a/tools/feedwrapper.py
+++ b/tools/feedwrapper.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.4
+#!/usr/bin/env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -15,8 +15,8 @@
# limitations under the License.
"""
Thie is feedwrapper - a mailing list auto-subscriber and/or feed passthrough program.
-Activate it by adding "|/usr/bin/env python3.4 /path/to/ponymail/tools/feedwrapper.py localuser@thisdomain.abc"
-Then subscribe to lists by running: python3.4 feedwrapper sub localuser@thisdomain.abc ml-subscribe@mldomain.foo"
+Activate it by adding "|/usr/bin/env python3 /path/to/ponymail/tools/feedwrapper.py localuser@thisdomain.abc"
+Then subscribe to lists by running: python3 feedwrapper sub localuser@thisdomain.abc ml-subscribe@mldomain.foo"
"""
import sys, re, os, email, smtplib
@@ -67,7 +67,7 @@ Subject: %s
with open("%s/wrapper.log" % path, "a") as f:
f.write("Got an email for %s\n" % (msg.get('list-id') or "??"))
f.write("%s - %s: %s\n" % (msg.get('to'), msg.get('reply-to'), msg.get('subject')))
- p = Popen("/usr/bin/python3.4 %s/../mm3/plugin.py" % path, shell=True, stdin=PIPE, stderr=PIPE, stdout=sys.stdout)
+ p = Popen("/usr/bin/python3 %s/../mm3/plugin.py" % path, shell=True, stdin=PIPE, stderr=PIPE, stdout=sys.stdout)
print(p.communicate(input=msg.as_string().encode('utf-8')))
p.stdin.close()
f.write("-----\n")
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/18839d5e/tools/import-mbox.py
----------------------------------------------------------------------
diff --git a/tools/import-mbox.py b/tools/import-mbox.py
index 6ca43a5..da5b27e 100755
--- a/tools/import-mbox.py
+++ b/tools/import-mbox.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.4
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Licensed to the Apache Software Foundation (ASF) under one or more
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/18839d5e/tools/ll.py
----------------------------------------------------------------------
diff --git a/tools/ll.py b/tools/ll.py
index 6e7d0e2..9929f10 100755
--- a/tools/ll.py
+++ b/tools/ll.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.4
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/18839d5e/tools/missing.py
----------------------------------------------------------------------
diff --git a/tools/missing.py b/tools/missing.py
index 0f5426d..09ea239 100755
--- a/tools/missing.py
+++ b/tools/missing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.4
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/18839d5e/tools/trace.py
----------------------------------------------------------------------
diff --git a/tools/trace.py b/tools/trace.py
index f176a8b..c16c3ec 100644
--- a/tools/trace.py
+++ b/tools/trace.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.4
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with