[packages/python] - up to 2.7.5
arekm
arekm at pld-linux.org
Mon May 27 20:12:55 CEST 2013
commit 487a0ac6b57ff7ff6b48c057c45d6be2fb74f668
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon May 27 20:12:52 2013 +0200
- up to 2.7.5
python-sysloghandler.patch | 99 ----------------------------------------------
python.spec | 12 +++---
2 files changed, 5 insertions(+), 106 deletions(-)
---
diff --git a/python.spec b/python.spec
index 73bfae4..9b0af9f 100644
--- a/python.spec
+++ b/python.spec
@@ -42,15 +42,15 @@ Summary(ru.UTF-8): Язык программирования очень высо
Summary(tr.UTF-8): X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
Summary(uk.UTF-8): Мова програмування дуже високого рівня з X-інтерфейсом
Name: python
-Version: %{py_ver}.4
-Release: 3
+Version: %{py_ver}.5
+Release: 1
Epoch: 1
License: PSF
Group: Development/Languages/Python
Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}%{beta}.tar.bz2
-# Source0-md5: 62704ea0f125923208d84ff0568f7d50
+# Source0-md5: 6334b666b7ff2038c761d7b27ba699c1
Source1: http://www.python.org/ftp/python/doc/%{dver}/%{name}-%{dver}-docs-html.tar.bz2
-# Source1-md5: 45be073ad81e1b2f6ad1fa25132f60c6
+# Source1-md5: 77ae8fd6b456c6339a1a62d57425335b
Patch1: %{name}-pythonpath.patch
Patch2: %{name}-ac_fixes.patch
@@ -58,8 +58,7 @@ Patch3: %{name}-lib64.patch
Patch4: %{name}-noarch_to_datadir.patch
Patch5: %{name}-verbose.patch
Patch6: %{name}-distro.patch
-Patch7: %{name}-sysloghandler.patch
-Patch8: %{name}-DNStests.patch
+Patch7: %{name}-DNStests.patch
URL: http://www.python.org/
BuildRequires: autoconf >= 2.65
BuildRequires: automake
@@ -560,7 +559,6 @@ Przykłady te są dla Pythona 2.3.4, nie %{version}.
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
tar xjf %{SOURCE1}
diff --git a/python-sysloghandler.patch b/python-sysloghandler.patch
deleted file mode 100644
index 9377b05..0000000
--- a/python-sysloghandler.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-
-# HG changeset patch
-# User Vinay Sajip <vinay_sajip at yahoo.co.uk>
-# Date 1366621131 -3600
-# Node ID 32a5de0e91d5612dca65d5d34f5e142e493d6e62
-# Parent a1421d28393b4ee88965a747b92296bde81bae05
-Issue #17795: Reverted backwards-incompatible change in SysLogHandler with Unix domain sockets.
-
-diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
---- a/Lib/logging/handlers.py
-+++ b/Lib/logging/handlers.py
-@@ -1,4 +1,4 @@
--# Copyright 2001-2012 by Vinay Sajip. All Rights Reserved.
-+# Copyright 2001-2013 by Vinay Sajip. All Rights Reserved.
- #
- # Permission to use, copy, modify, and distribute this software and its
- # documentation for any purpose and without fee is hereby granted,
-@@ -18,7 +18,7 @@
- Additional handlers for the logging package for Python. The core package is
- based on PEP 282 and comments thereto in comp.lang.python.
-
--Copyright (C) 2001-2012 Vinay Sajip. All Rights Reserved.
-+Copyright (C) 2001-2013 Vinay Sajip. All Rights Reserved.
-
- To use, simply 'import logging.handlers' and log away!
- """
-@@ -737,13 +737,17 @@ class SysLogHandler(logging.Handler):
- }
-
- def __init__(self, address=('localhost', SYSLOG_UDP_PORT),
-- facility=LOG_USER, socktype=socket.SOCK_DGRAM):
-+ facility=LOG_USER, socktype=None):
- """
- Initialize a handler.
-
- If address is specified as a string, a UNIX socket is used. To log to a
- local syslogd, "SysLogHandler(address="/dev/log")" can be used.
-- If facility is not specified, LOG_USER is used.
-+ If facility is not specified, LOG_USER is used. If socktype is
-+ specified as socket.SOCK_DGRAM or socket.SOCK_STREAM, that specific
-+ socket type will be used. For Unix sockets, you can also specify a
-+ socktype of None, in which case socket.SOCK_DGRAM will be used, falling
-+ back to socket.SOCK_STREAM.
- """
- logging.Handler.__init__(self)
-
-@@ -756,18 +760,37 @@ class SysLogHandler(logging.Handler):
- self._connect_unixsocket(address)
- else:
- self.unixsocket = 0
-+ if socktype is None:
-+ socktype = socket.SOCK_DGRAM
- self.socket = socket.socket(socket.AF_INET, socktype)
- if socktype == socket.SOCK_STREAM:
- self.socket.connect(address)
-+ self.socktype = socktype
- self.formatter = None
-
- def _connect_unixsocket(self, address):
-- self.socket = socket.socket(socket.AF_UNIX, self.socktype)
-+ use_socktype = self.socktype
-+ if use_socktype is None:
-+ use_socktype = socket.SOCK_DGRAM
-+ self.socket = socket.socket(socket.AF_UNIX, use_socktype)
- try:
- self.socket.connect(address)
-+ # it worked, so set self.socktype to the used type
-+ self.socktype = use_socktype
- except socket.error:
- self.socket.close()
-- raise
-+ if self.socktype is not None:
-+ # user didn't specify falling back, so fail
-+ raise
-+ use_socktype = socket.SOCK_STREAM
-+ self.socket = socket.socket(socket.AF_UNIX, use_socktype)
-+ try:
-+ self.socket.connect(address)
-+ # it worked, so set self.socktype to the used type
-+ self.socktype = use_socktype
-+ except socket.error:
-+ self.socket.close()
-+ raise
-
- # curious: when talking to the unix-domain '/dev/log' socket, a
- # zero-terminator seems to be required. this string is placed
-diff --git a/Misc/NEWS b/Misc/NEWS
---- a/Misc/NEWS
-+++ b/Misc/NEWS
-@@ -21,6 +21,9 @@
- Library
- -------
-
-+- Issue #17795: Reverted backwards-incompatible change in SysLogHandler with
-+ Unix domain sockets.
-+
- - Issue #17625: In IDLE, close the replace dialog after it is used.
-
- - Issue #17531: Fix tests that thought group and user ids were always the int
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python.git/commitdiff/487a0ac6b57ff7ff6b48c057c45d6be2fb74f668
More information about the pld-cvs-commit
mailing list