[Python-modules-commits] [pycurl] 70/140: Import pycurl_7.16.4.orig.tar.gz
Barry Warsaw
barry at moszumanska.debian.org
Wed Oct 1 21:45:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository pycurl.
commit 9b0eb2fe393224f75230d4656a0739a2cb69bce2
Author: Barry Warsaw <barry at python.org>
Date: Wed Oct 1 16:43:41 2014 -0400
Import pycurl_7.16.4.orig.tar.gz
---
ChangeLog | 17 +++++++++++++++--
PKG-INFO | 2 +-
TODO | 12 ++++++------
setup.py | 6 +++---
setup_win32_ssl.py | 4 ++--
src/pycurl.c | 15 ++++++++++-----
6 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d054d75..1c117ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,22 @@
-Version 7.16.2.1 [requires libcurl-7.16.2 or better]
+Version 7.16.4 [requires libcurl-7.16.4 or better]
+--------------
+
+ * Allow any callable object as the callback function.
+ This change comes handy when you would like to use objects
+ which are callable but are not functions or methods, for
+ example those objects created by the functions in the functools
+ module (patch by Daniel Peña Arteaga <dpena at ph.tum.de>).
+
+ * Added NEW_DIRECTORY_PERMS and NEW_FILE_PERMS options.
+
+
+Version 7.16.2.1
+----------------
* Added IOCMD_NOP and IOCMD_RESTARTREAD for ioctl callback
handling (patch by Mark Eichin).
- * Use Py_ssize_t where appropriate for Python 2.5 and 64bit
+ * Use Py_ssize_t where appropriate for Python 2.5 and 64-bit
compatibility. This fixes the problem reported by Aaron
Hill, where the exception "pycurl.error: (2, '')" is thrown
when calling setopt(pycurl.POSTFIELDS,...) on 64-bit
diff --git a/PKG-INFO b/PKG-INFO
index 36b596a..655bfda 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: pycurl
-Version: 7.16.2.1
+Version: 7.16.4
Summary: PycURL -- cURL library module for Python
Home-page: http://pycurl.sourceforge.net/
Author: Kjetil Jacobsen, Markus F.X.J. Oberhumer
diff --git a/TODO b/TODO
index 46aaf58..5cad43e 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-# $Id: TODO,v 1.97 2007/03/04 19:32:23 kjetilja Exp $
+# $Id: TODO,v 1.98 2007/04/23 19:49:15 kjetilja Exp $
# vi:ts=4:et
If you want to hack on pycurl, here's our list of unresolved issues:
@@ -20,8 +20,8 @@ NEW FEATURES/IMPROVEMENTS:
DEFICIENICES:
* Using certain invalid options, it may be possible to cause a crash.
- This is un-Pythonic behaviour, but you somewhere have to draw a line
- between efficiency (and feature completeness) and safety.
- There _are_ quite a number of internal error checks, but tracking and
- catching all possible (deliberate) misuses is not a goal (and probably
- impossible anyway, due to the complexity of libcurl).
+ This is un-Pythonic behaviour, but you somewhere have to draw a
+ line between efficiency (and feature completeness) and safety.
+ There _are_ quite a number of internal error checks, but tracking
+ and catching all possible (deliberate) misuses is not a goal
+ (and probably impossible anyway, due to the complexity of libcurl).
diff --git a/setup.py b/setup.py
index be2c41c..0829b21 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,13 @@
#! /usr/bin/env python
# -*- coding: iso-8859-1 -*-
# vi:ts=4:et
-# $Id: setup.py,v 1.141 2007/04/23 17:22:55 kjetilja Exp $
+# $Id: setup.py,v 1.143 2007/07/11 17:31:07 kjetilja Exp $
"""Setup script for the PycURL module distribution."""
PACKAGE = "pycurl"
PY_PACKAGE = "curl"
-VERSION = "7.16.2.1"
+VERSION = "7.16.4"
import glob, os, re, sys, string
import distutils
@@ -63,7 +63,7 @@ if sys.platform == "win32":
# Windows users have to configure the CURL_DIR path parameter to match
# their cURL source installation. The path set here is just an example
# and thus unlikely to match your installation.
- CURL_DIR = r"c:\src\build\pycurl\curl-7.15.0"
+ CURL_DIR = r"c:\src\build\pycurl\curl-7.16.2.1"
CURL_DIR = scan_argv("--curl-dir=", CURL_DIR)
print "Using curl directory:", CURL_DIR
assert os.path.isdir(CURL_DIR), "please check CURL_DIR in setup.py"
diff --git a/setup_win32_ssl.py b/setup_win32_ssl.py
index 5cf7922..eb3f679 100644
--- a/setup_win32_ssl.py
+++ b/setup_win32_ssl.py
@@ -1,13 +1,13 @@
#! /usr/bin/env python
# -*- coding: iso-8859-1 -*-
# vi:ts=4:et
-# $Id: setup_win32_ssl.py,v 1.41 2007/04/23 17:22:55 kjetilja Exp $
+# $Id: setup_win32_ssl.py,v 1.42 2007/07/11 20:12:59 kjetilja Exp $
import os, sys, string
assert sys.platform == "win32", "Only for building on Win32 with SSL and zlib"
-CURL_DIR = r"c:\src\build\pycurl\curl-7.16.2.1-ssl"
+CURL_DIR = r"c:\src\build\pycurl\curl-7.16.4-ssl"
OPENSSL_DIR = r"c:\src\build\pycurl\openssl-0.9.7g"
sys.argv.insert(1, "--curl-dir=" + CURL_DIR)
diff --git a/src/pycurl.c b/src/pycurl.c
index 2e9890f..e8b6f8c 100644
--- a/src/pycurl.c
+++ b/src/pycurl.c
@@ -1,4 +1,4 @@
-/* $Id: pycurl.c,v 1.133 2007/04/23 17:24:21 kjetilja Exp $ */
+/* $Id: pycurl.c,v 1.136 2007/07/11 17:31:07 kjetilja Exp $ */
/* PycURL -- cURL Python module
*
@@ -22,6 +22,7 @@
* Bastian Kleineidam
* Mark Eichin
* Aaron Hill <visine19 at hotmail.com>
+ * Daniel Peña Arteaga <dpena ph.tum.de>
*
* See file COPYING for license information.
*/
@@ -50,8 +51,8 @@
#if !defined(PY_VERSION_HEX) || (PY_VERSION_HEX < 0x02020000)
# error "Need Python version 2.2 or greater to compile pycurl."
#endif
-#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x071002)
-# error "Need libcurl version 7.16.2 or greater to compile pycurl."
+#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x071004)
+# error "Need libcurl version 7.16.4 or greater to compile pycurl."
#endif
/* Python < 2.5 compat for Py_ssize_t */
@@ -1897,7 +1898,8 @@ do_curl_setopt(CurlObject *self, PyObject *args)
}
/* Handle the case of function objects for callbacks */
- if (PyFunction_Check(obj) || PyCFunction_Check(obj) || PyMethod_Check(obj)) {
+ if (PyFunction_Check(obj) || PyCFunction_Check(obj) ||
+ PyCallable_Check(obj) || PyMethod_Check(obj)) {
/* We use function types here to make sure that our callback
* definitions exactly match the <curl/curl.h> interface.
*/
@@ -2347,7 +2349,8 @@ do_multi_setopt(CurlMultiObject *self, PyObject *args)
Py_INCREF(Py_None);
return Py_None;
}
- if (PyFunction_Check(obj) || PyCFunction_Check(obj) || PyMethod_Check(obj)) {
+ if (PyFunction_Check(obj) || PyCFunction_Check(obj) ||
+ PyCallable_Check(obj) || PyMethod_Check(obj)) {
/* We use function types here to make sure that our callback
* definitions exactly match the <curl/multi.h> interface.
*/
@@ -3564,6 +3567,8 @@ initpycurl(void)
insint_c(d, "CONNECTTIMEOUT_MS", CURLOPT_CONNECTTIMEOUT_MS);
insint_c(d, "HTTP_TRANSFER_DECODING", CURLOPT_HTTP_TRANSFER_DECODING);
insint_c(d, "HTTP_CONTENT_DECODING", CURLOPT_HTTP_CONTENT_DECODING);
+ insint_c(d, "NEW_FILE_PERMS", CURLOPT_NEW_FILE_PERMS);
+ insint_c(d, "NEW_DIRECTORY_PERMS", CURLOPT_NEW_DIRECTORY_PERMS);
insint_c(d, "M_TIMERFUNCTION", CURLMOPT_TIMERFUNCTION);
insint_c(d, "M_SOCKETFUNCTION", CURLMOPT_SOCKETFUNCTION);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pycurl.git
More information about the Python-modules-commits
mailing list