diff options
author | Hye-Shik Chang <perky@FreeBSD.org> | 2005-04-03 13:55:44 +0000 |
---|---|---|
committer | Hye-Shik Chang <perky@FreeBSD.org> | 2005-04-03 13:55:44 +0000 |
commit | 88c5d79c025a935e077a2f496c3edeeeea14dda6 (patch) | |
tree | 43c5840e07ccf2f30fb1ee53bd13437918e8de39 /lang/python | |
parent | Fix Type1 PS font install directories of print/cmpsfont (diff) |
Update to Python 2.4.1
Notes
Notes:
svn path=/head/; revision=132349
Diffstat (limited to 'lang/python')
-rw-r--r-- | lang/python/Makefile | 3 | ||||
-rw-r--r-- | lang/python/distinfo | 2 | ||||
-rw-r--r-- | lang/python/files/patch-Lib::SimpleXMLRPCServer.py | 125 | ||||
-rw-r--r-- | lang/python/files/patch-Lib::test::test_fcntl.py | 17 | ||||
-rw-r--r-- | lang/python/pkg-plist | 23 |
5 files changed, 43 insertions, 127 deletions
diff --git a/lang/python/Makefile b/lang/python/Makefile index 8cbd19756eb4..906d0506b333 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -6,8 +6,7 @@ # PORTNAME= python -PORTVERSION= 2.4 -PORTREVISION= 1 +PORTVERSION= 2.4.1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python/distinfo b/lang/python/distinfo index 5e7b9bbf6cd6..f283a23938c2 100644 --- a/lang/python/distinfo +++ b/lang/python/distinfo @@ -17,5 +17,7 @@ MD5 (python/Python-2.3.5.tgz) = 7a1ecc1196c5c0e9d4eef90ba684c4e9 SIZE (python/Python-2.3.5.tgz) = 8535749 MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606 SIZE (python/Python-2.4.tgz) = 9198035 +MD5 (python/Python-2.4.1.tgz) = 7bb2416a4f421c3452d306694d3efbba +SIZE (python/Python-2.4.1.tgz) = 9219882 MD5 (python/Python-2.5.a0.20050129.tgz) = bdf571f3e28c4793bedbd180611c28e6 SIZE (python/Python-2.5.a0.20050129.tgz) = 9227299 diff --git a/lang/python/files/patch-Lib::SimpleXMLRPCServer.py b/lang/python/files/patch-Lib::SimpleXMLRPCServer.py deleted file mode 100644 index 54b8b4523f4e..000000000000 --- a/lang/python/files/patch-Lib::SimpleXMLRPCServer.py +++ /dev/null @@ -1,125 +0,0 @@ -Index: Lib/SimpleXMLRPCServer.py -=================================================================== -RCS file: /cvsroot/python/python/dist/src/Lib/SimpleXMLRPCServer.py,v -retrieving revision 1.7.8.1 -diff -c -r1.7.8.1 SimpleXMLRPCServer.py -*** Lib/SimpleXMLRPCServer.py 3 Oct 2004 23:23:00 -0000 1.7.8.1 ---- Lib/SimpleXMLRPCServer.py 3 Feb 2005 05:33:55 -0000 -*************** -*** 107,120 **** - import types - import os - -! def resolve_dotted_attribute(obj, attr): - """resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d - - Resolves a dotted attribute name to an object. Raises - an AttributeError if any attribute in the chain starts with a '_'. - """ - -! for i in attr.split('.'): - if i.startswith('_'): - raise AttributeError( - 'attempt to access private attribute "%s"' % i ---- 107,128 ---- - import types - import os - -! def resolve_dotted_attribute(obj, attr, allow_dotted_names=True): - """resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d - - Resolves a dotted attribute name to an object. Raises - an AttributeError if any attribute in the chain starts with a '_'. -+ -+ If the optional allow_dotted_names argument is false, dots are not -+ supported and this function operates similar to getattr(obj, attr). - """ - -! if allow_dotted_names: -! attrs = attr.split('.') -! else: -! attrs = [attr] -! -! for i in attrs: - if i.startswith('_'): - raise AttributeError( - 'attempt to access private attribute "%s"' % i -*************** -*** 156,162 **** - self.funcs = {} - self.instance = None - -! def register_instance(self, instance): - """Registers an instance to respond to XML-RPC requests. - - Only one instance can be installed at a time. ---- 164,170 ---- - self.funcs = {} - self.instance = None - -! def register_instance(self, instance, allow_dotted_names=False): - """Registers an instance to respond to XML-RPC requests. - - Only one instance can be installed at a time. -*************** -*** 174,182 **** ---- 182,204 ---- - - If a registered function matches a XML-RPC request, then it - will be called instead of the registered instance. -+ -+ If the optional allow_dotted_names argument is true and the -+ instance does not have a _dispatch method, method names -+ containing dots are supported and resolved, as long as none of -+ the name segments start with an '_'. -+ -+ *** SECURITY WARNING: *** -+ -+ Enabling the allow_dotted_names options allows intruders -+ to access your module's global variables and may allow -+ intruders to execute arbitrary code on your machine. Only -+ use this option on a secure, closed network. -+ - """ - - self.instance = instance -+ self.allow_dotted_names = allow_dotted_names - - def register_function(self, function, name = None): - """Registers a function to respond to XML-RPC requests. -*************** -*** 295,301 **** - try: - method = resolve_dotted_attribute( - self.instance, -! method_name - ) - except AttributeError: - pass ---- 317,324 ---- - try: - method = resolve_dotted_attribute( - self.instance, -! method_name, -! self.allow_dotted_names - ) - except AttributeError: - pass -*************** -*** 374,380 **** - try: - func = resolve_dotted_attribute( - self.instance, -! method - ) - except AttributeError: - pass ---- 397,404 ---- - try: - func = resolve_dotted_attribute( - self.instance, -! method, -! self.allow_dotted_names - ) - except AttributeError: - pass diff --git a/lang/python/files/patch-Lib::test::test_fcntl.py b/lang/python/files/patch-Lib::test::test_fcntl.py new file mode 100644 index 000000000000..1bd7ba46306e --- /dev/null +++ b/lang/python/files/patch-Lib::test::test_fcntl.py @@ -0,0 +1,17 @@ +--- Lib/test/test_fcntl.py.orig Sun Apr 3 22:45:13 2005 ++++ Lib/test/test_fcntl.py Sun Apr 3 22:45:19 2005 +@@ -24,7 +24,13 @@ + 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6', + 'bsdos2', 'bsdos3', 'bsdos4', + 'openbsd', 'openbsd2', 'openbsd3'): +- lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, fcntl.F_WRLCK, 0) ++ if struct.calcsize('l') == 8: ++ off_t = 'l' ++ pid_t = 'i' ++ else: ++ off_t = 'lxxxx' ++ pid_t = 'l' ++ lockdata = struct.pack(off_t+off_t+pid_t+'hh', 0, 0, 0, fcntl.F_WRLCK, 0) + elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']: + lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0) + elif sys.platform in ['os2emx']: diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist index 6fb1d1f126d2..69e408c02a9f 100644 --- a/lang/python/pkg-plist +++ b/lang/python/pkg-plist @@ -500,6 +500,27 @@ lib/%%PYTHON_VERSION%%/distutils/spawn.pyo lib/%%PYTHON_VERSION%%/distutils/sysconfig.py lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyc lib/%%PYTHON_VERSION%%/distutils/sysconfig.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.py +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/__init__.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/support.py +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/support.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_py.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_build_scripts.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_dist.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install.pyo +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.py +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyc +lib/%%PYTHON_VERSION%%/distutils/tests/test_install_scripts.pyo lib/%%PYTHON_VERSION%%/distutils/text_file.py lib/%%PYTHON_VERSION%%/distutils/text_file.pyc lib/%%PYTHON_VERSION%%/distutils/text_file.pyo @@ -635,6 +656,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_41.txt lib/%%PYTHON_VERSION%%/email/test/data/msg_42.txt +lib/%%PYTHON_VERSION%%/email/test/data/msg_43.txt lib/%%PYTHON_VERSION%%/email/test/test_email.py lib/%%PYTHON_VERSION%%/email/test/test_email.pyc lib/%%PYTHON_VERSION%%/email/test/test_email.pyo @@ -3360,6 +3382,7 @@ share/emacs/site-lisp/python-mode.el @dirrm lib/%%PYTHON_VERSION%%/email/test/data @dirrm lib/%%PYTHON_VERSION%%/email/test @dirrm lib/%%PYTHON_VERSION%%/email +@dirrm lib/%%PYTHON_VERSION%%/distutils/tests @dirrm lib/%%PYTHON_VERSION%%/distutils/command @dirrm lib/%%PYTHON_VERSION%%/distutils @dirrm lib/%%PYTHON_VERSION%%/curses |