Merge pull request #840 from cjkoenig/update_liburcu
[feed/packages.git] / mail / mailman / patches / 400-modules.patch
1 diff -Naur mailman-2.1.18-1/Mailman/MailList.py mailman-2.1.18-1_patched/Mailman/MailList.py
2 --- mailman-2.1.18-1/Mailman/MailList.py 2014-05-06 20:43:56.000000000 +0400
3 +++ mailman-2.1.18-1_patched/Mailman/MailList.py 2014-11-04 15:57:06.832636147 +0300
4 @@ -30,7 +30,7 @@
5 import shutil
6 import socket
7 import urllib
8 -import cPickle
9 +import pickle as cPickle
10
11 from cStringIO import StringIO
12 from UserDict import UserDict
13 diff -Naur mailman-2.1.18-1/misc/paths.py.in mailman-2.1.18-1_patched/misc/paths.py.in
14 --- mailman-2.1.18-1/misc/paths.py.in 2014-05-06 20:43:56.000000000 +0400
15 +++ mailman-2.1.18-1_patched/misc/paths.py.in 2014-11-04 15:55:49.594941540 +0300
16 @@ -66,14 +66,14 @@
17 # In a normal interactive Python environment, the japanese.pth and korean.pth
18 # files would be imported automatically. But because we inhibit the importing
19 # of the site module, we need to be explicit about importing these codecs.
20 -if not jaok:
21 - import japanese
22 +#if not jaok:
23 +# import japanese
24 # As of KoreanCodecs 2.0.5, you had to do the second import to get the Korean
25 # codecs installed, however leave the first import in there in case an upgrade
26 # changes this.
27 -if not kook:
28 - import korean
29 - import korean.aliases
30 +#if not kook:
31 +# import korean
32 +# import korean.aliases
33 # Arabic and Hebrew (RFC-1556) encoding aliases. (temporary solution)
34 import encodings.aliases
35 encodings.aliases.aliases.update({