diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2018-07-30 11:27:01 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2018-07-30 12:19:29 +0300 |
commit | 9d702d09a8cdf3635a6cb33219bb1ea96e826d27 (patch) | |
tree | cf435e317df59791854d47aeab0f7b9a2d70d4dc | |
parent | 62666075e3c7276d308dffef42c7c50dc526925b (diff) | |
download | mailutils-9d702d09a8cdf3635a6cb33219bb1ea96e826d27.tar.gz mailutils-9d702d09a8cdf3635a6cb33219bb1ea96e826d27.tar.bz2 |
Support for Python 3
Support for v2 is retained for a while. Both the API and the syntax of the
two versions differ considerably enough to keep both versions apart in
parallel directory subtrees, instead of fiddling with CPP directives and
Automake conditionals. So, instead of prior 'python/' and 'examples/python'
we now have 'python/2', 'python/3', and 'examples/python/2' with
'examples/python/3'. The customized loader is modified to insert the
appropriate path to the sys.path.
When Python 2 is definitely gone, the directory structures will be flattened
again, by removing additional version number subdirectory.
* Makefile.am (SUBDIRS): Add python unconditionally
* configure.ac (PYTHON_MAJOR): New substvar.
(MU_LIB_PY): Change path
(MU_COND_PYTHON2,MU_COND_PYTHON3): New conditionals.
* examples/python/*: Rename to examples/python/2/*
* examples/python/3/Makefile.am: New file.
* examples/python/3/addr.py: New file.
* examples/python/3/auth.py: New file.
* examples/python/3/iconv.py: New file.
* examples/python/3/lsf.py: New file.
* examples/python/3/mailcap.py: New file.
* examples/python/3/mimetest.py: New file.
* examples/python/3/msg-send.py: New file.
* examples/python/3/sfrom.py: New file.
* examples/python/3/url-parse.py: New file.
* include/mailutils/python.h: Remove inclusion of Python.h. It
must included before all other files.
* lib/python.c: Include Python.h
* python/*: Rename to python/2/*
* python/usercustomize.py: Insert path to the appropriate Python version
implementation to the sys.path
* python/3/Makefile.am: New file.
* python/3/libmu_py/Makefile.am: New file.
* python/3/libmu_py/address.c: New file.
* python/3/libmu_py/attribute.c: New file.
* python/3/libmu_py/auth.c: New file.
* python/3/libmu_py/body.c: New file.
* python/3/libmu_py/envelope.c: New file.
* python/3/libmu_py/errno.c: New file.
* python/3/libmu_py/error.c: New file.
* python/3/libmu_py/filter.c: New file.
* python/3/libmu_py/folder.c: New file.
* python/3/libmu_py/header.c: New file.
* python/3/libmu_py/libmu_py.c: New file.
* python/3/libmu_py/libmu_py.h: New file.
* python/3/libmu_py/list.c: New file.
* python/3/libmu_py/mailbox.c: New file.
* python/3/libmu_py/mailcap.c: New file.
* python/3/libmu_py/mailer.c: New file.
* python/3/libmu_py/message.c: New file.
* python/3/libmu_py/mime.c: New file.
* python/3/libmu_py/nls.c: New file.
* python/3/libmu_py/registrar.c: New file.
* python/3/libmu_py/script.c: New file.
* python/3/libmu_py/secret.c: New file.
* python/3/libmu_py/sieve.c: New file.
* python/3/libmu_py/stream.c: New file.
* python/3/libmu_py/url.c: New file.
* python/3/libmu_py/util.c: New file.
* python/3/mailutils/Makefile.am: New file.
* python/3/mailutils/__init__.py: New file.
* python/3/mailutils/address.py: New file.
* python/3/mailutils/attribute.py: New file.
* python/3/mailutils/auth.py: New file.
* python/3/mailutils/body.py: New file.
* python/3/mailutils/c_api.c: New file.
* python/3/mailutils/envelope.py: New file.
* python/3/mailutils/error.py: New file.
* python/3/mailutils/filter.py: New file.
* python/3/mailutils/folder.py: New file.
* python/3/mailutils/header.py: New file.
* python/3/mailutils/mailbox.py: New file.
* python/3/mailutils/mailcap.py: New file.
* python/3/mailutils/mailer.py: New file.
* python/3/mailutils/message.py: New file.
* python/3/mailutils/mime.py: New file.
* python/3/mailutils/nls.py: New file.
* python/3/mailutils/registrar.py: New file.
* python/3/mailutils/secret.py: New file.
* python/3/mailutils/sieve.py: New file.
* python/3/mailutils/stream.py: New file.
* python/3/mailutils/url.py: New file.
* python/3/mailutils/util.py: New file.
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | configure.ac | 35 | ||||
-rw-r--r-- | examples/python/2/Makefile.am | 27 | ||||
-rw-r--r-- | examples/python/2/addr.py (renamed from examples/python/addr.py) | 0 | ||||
-rw-r--r-- | examples/python/2/auth.py (renamed from examples/python/auth.py) | 0 | ||||
-rw-r--r-- | examples/python/2/iconv.py (renamed from examples/python/iconv.py) | 0 | ||||
-rw-r--r-- | examples/python/2/lsf.py (renamed from examples/python/lsf.py) | 0 | ||||
-rw-r--r-- | examples/python/2/mailcap.py (renamed from examples/python/mailcap.py) | 0 | ||||
-rw-r--r-- | examples/python/2/mimetest.py (renamed from examples/python/mimetest.py) | 0 | ||||
-rw-r--r-- | examples/python/2/msg-send.py (renamed from examples/python/msg-send.py) | 0 | ||||
-rw-r--r-- | examples/python/2/sfrom.py (renamed from examples/python/sfrom.py) | 0 | ||||
-rw-r--r-- | examples/python/2/url-parse.py (renamed from examples/python/url-parse.py) | 0 | ||||
-rw-r--r-- | examples/python/3/Makefile.am | 27 | ||||
-rw-r--r-- | examples/python/3/addr.py | 70 | ||||
-rw-r--r-- | examples/python/3/auth.py | 85 | ||||
-rw-r--r-- | examples/python/3/iconv.py | 35 | ||||
-rw-r--r-- | examples/python/3/lsf.py | 61 | ||||
-rw-r--r-- | examples/python/3/mailcap.py | 35 | ||||
-rw-r--r-- | examples/python/3/mimetest.py | 150 | ||||
-rw-r--r-- | examples/python/3/msg-send.py | 73 | ||||
-rw-r--r-- | examples/python/3/sfrom.py | 36 | ||||
-rw-r--r-- | examples/python/3/url-parse.py | 64 | ||||
-rw-r--r-- | examples/python/Makefile.am | 28 | ||||
-rw-r--r-- | include/mailutils/python.h | 2 | ||||
-rw-r--r-- | lib/python.c | 3 | ||||
-rw-r--r-- | python/2/Makefile.am | 18 | ||||
-rw-r--r-- | python/2/libmu_py/Makefile.am (renamed from python/libmu_py/Makefile.am) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/address.c (renamed from python/libmu_py/address.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/attribute.c (renamed from python/libmu_py/attribute.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/auth.c (renamed from python/libmu_py/auth.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/body.c (renamed from python/libmu_py/body.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/envelope.c (renamed from python/libmu_py/envelope.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/errno.c (renamed from python/libmu_py/errno.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/error.c (renamed from python/libmu_py/error.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/filter.c (renamed from python/libmu_py/filter.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/folder.c (renamed from python/libmu_py/folder.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/header.c (renamed from python/libmu_py/header.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/libmu_py.c (renamed from python/libmu_py/libmu_py.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/libmu_py.h (renamed from python/libmu_py/libmu_py.h) | 2 | ||||
-rw-r--r-- | python/2/libmu_py/list.c (renamed from python/libmu_py/list.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/mailbox.c (renamed from python/libmu_py/mailbox.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/mailcap.c (renamed from python/libmu_py/mailcap.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/mailer.c (renamed from python/libmu_py/mailer.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/message.c (renamed from python/libmu_py/message.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/mime.c (renamed from python/libmu_py/mime.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/nls.c (renamed from python/libmu_py/nls.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/registrar.c (renamed from python/libmu_py/registrar.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/script.c (renamed from python/libmu_py/script.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/secret.c (renamed from python/libmu_py/secret.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/sieve.c (renamed from python/libmu_py/sieve.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/stream.c (renamed from python/libmu_py/stream.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/url.c (renamed from python/libmu_py/url.c) | 0 | ||||
-rw-r--r-- | python/2/libmu_py/util.c (renamed from python/libmu_py/util.c) | 0 | ||||
-rw-r--r-- | python/2/mailutils/Makefile.am (renamed from python/mailutils/Makefile.am) | 2 | ||||
-rw-r--r-- | python/2/mailutils/__init__.py (renamed from python/mailutils/__init__.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/address.py (renamed from python/mailutils/address.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/attribute.py (renamed from python/mailutils/attribute.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/auth.py (renamed from python/mailutils/auth.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/body.py (renamed from python/mailutils/body.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/c_api.c (renamed from python/mailutils/c_api.c) | 0 | ||||
-rw-r--r-- | python/2/mailutils/envelope.py (renamed from python/mailutils/envelope.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/error.py (renamed from python/mailutils/error.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/filter.py (renamed from python/mailutils/filter.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/folder.py (renamed from python/mailutils/folder.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/header.py (renamed from python/mailutils/header.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/mailbox.py (renamed from python/mailutils/mailbox.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/mailcap.py (renamed from python/mailutils/mailcap.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/mailer.py (renamed from python/mailutils/mailer.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/message.py (renamed from python/mailutils/message.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/mime.py (renamed from python/mailutils/mime.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/nls.py (renamed from python/mailutils/nls.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/registrar.py (renamed from python/mailutils/registrar.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/secret.py (renamed from python/mailutils/secret.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/sieve.py (renamed from python/mailutils/sieve.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/stream.py (renamed from python/mailutils/stream.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/url.py (renamed from python/mailutils/url.py) | 0 | ||||
-rw-r--r-- | python/2/mailutils/util.py (renamed from python/mailutils/util.py) | 0 | ||||
-rw-r--r-- | python/3/Makefile.am | 18 | ||||
-rw-r--r-- | python/3/libmu_py/Makefile.am | 62 | ||||
-rw-r--r-- | python/3/libmu_py/address.c | 331 | ||||
-rw-r--r-- | python/3/libmu_py/attribute.c | 268 | ||||
-rw-r--r-- | python/3/libmu_py/auth.c | 601 | ||||
-rw-r--r-- | python/3/libmu_py/body.c | 129 | ||||
-rw-r--r-- | python/3/libmu_py/envelope.c | 141 | ||||
-rw-r--r-- | python/3/libmu_py/errno.c | 42 | ||||
-rw-r--r-- | python/3/libmu_py/error.c | 55 | ||||
-rw-r--r-- | python/3/libmu_py/filter.c | 96 | ||||
-rw-r--r-- | python/3/libmu_py/folder.c | 253 | ||||
-rw-r--r-- | python/3/libmu_py/header.c | 218 | ||||
-rw-r--r-- | python/3/libmu_py/libmu_py.c | 143 | ||||
-rw-r--r-- | python/3/libmu_py/libmu_py.h | 96 | ||||
-rw-r--r-- | python/3/libmu_py/list.c | 52 | ||||
-rw-r--r-- | python/3/libmu_py/mailbox.c | 438 | ||||
-rw-r--r-- | python/3/libmu_py/mailcap.c | 262 | ||||
-rw-r--r-- | python/3/libmu_py/mailer.c | 183 | ||||
-rw-r--r-- | python/3/libmu_py/message.c | 379 | ||||
-rw-r--r-- | python/3/libmu_py/mime.c | 244 | ||||
-rw-r--r-- | python/3/libmu_py/nls.c | 74 | ||||
-rw-r--r-- | python/3/libmu_py/registrar.c | 142 | ||||
-rw-r--r-- | python/3/libmu_py/script.c | 119 | ||||
-rw-r--r-- | python/3/libmu_py/secret.c | 167 | ||||
-rw-r--r-- | python/3/libmu_py/sieve.c | 349 | ||||
-rw-r--r-- | python/3/libmu_py/stream.c | 410 | ||||
-rw-r--r-- | python/3/libmu_py/url.c | 254 | ||||
-rw-r--r-- | python/3/libmu_py/util.c | 119 | ||||
-rw-r--r-- | python/3/mailutils/Makefile.am | 49 | ||||
-rw-r--r-- | python/3/mailutils/__init__.py | 60 | ||||
-rw-r--r-- | python/3/mailutils/address.py | 109 | ||||
-rw-r--r-- | python/3/mailutils/attribute.py | 156 | ||||
-rw-r--r-- | python/3/mailutils/auth.py | 128 | ||||
-rw-r--r-- | python/3/mailutils/body.py | 56 | ||||
-rw-r--r-- | python/3/mailutils/c_api.c | 25 | ||||
-rw-r--r-- | python/3/mailutils/envelope.py | 44 | ||||
-rw-r--r-- | python/3/mailutils/error.py | 47 | ||||
-rw-r--r-- | python/3/mailutils/filter.py | 46 | ||||
-rw-r--r-- | python/3/mailutils/folder.py | 73 | ||||
-rw-r--r-- | python/3/mailutils/header.py | 181 | ||||
-rw-r--r-- | python/3/mailutils/mailbox.py | 227 | ||||
-rw-r--r-- | python/3/mailutils/mailcap.py | 111 | ||||
-rw-r--r-- | python/3/mailutils/mailer.py | 50 | ||||
-rw-r--r-- | python/3/mailutils/message.py | 158 | ||||
-rw-r--r-- |