[Python-modules-commits] [pycurl] 27/140: Import pycurl_7.14.1.orig.tar.gz
Barry Warsaw
barry at moszumanska.debian.org
Wed Oct 1 21:45:02 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 73404568914c09394697ba70594f8e2e13404c4b
Author: Barry Warsaw <barry at python.org>
Date: Wed Oct 1 16:43:27 2014 -0400
Import pycurl_7.14.1.orig.tar.gz
---
ChangeLog | 11 ++++++++++-
PKG-INFO | 4 ++--
README | 2 +-
examples/retriever-multi.py | 2 +-
examples/retriever.py | 2 +-
examples/xmlrpc_curl.py | 2 +-
python/curl/__init__.py | 1 +
setup.py | 8 ++++----
setup_win32_ssl.py | 4 ++--
src/pycurl.c | 11 ++++++++---
10 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6ad0e88..d6463bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-Version 7.14.0 [requires libcurl-7.13.2 or better]
+Version 7.14.1 [requires libcurl-7.14.1 or better]
+--------------
+
+2005-09-05 Kjetil Jacobsen <kjetilja>
+
+ * Added CURLOPT_IGNORE_CONTENT_LENGTH, CURLOPT_COOKIELIST as
+ COOKIELIST and CURLINFO_COOKIELIST as INFO_COOKIELIST.
+
+
+Version 7.14.0
--------------
2005-05-18 Kjetil Jacobsen <kjetilja>
diff --git a/PKG-INFO b/PKG-INFO
index 156b51a..ab046a3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,10 +1,10 @@
Metadata-Version: 1.0
Name: pycurl
-Version: 7.14.0
+Version: 7.14.1
Summary: PycURL -- cURL library module for Python
Home-page: http://pycurl.sourceforge.net/
Author: Kjetil Jacobsen, Markus F.X.J. Oberhumer
-Author-email: kjetilja at cs.uit.no, markus at oberhumer.com
+Author-email: kjetilja at gmail.com, markus at oberhumer.com
License: GNU Lesser General Public License (LGPL)
Description:
This module provides Python bindings for the cURL library.
diff --git a/README b/README
index bd04ab6..65de06a 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
LICENSE
-------
-Copyright (C) 2001-2005 by Kjetil Jacobsen <kjetilja at cs.uit.no>
+Copyright (C) 2001-2005 by Kjetil Jacobsen <kjetilja at gmail.com>
Copyright (C) 2001-2005 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
PycURL is free software; you can redistribute it and/or
diff --git a/examples/retriever-multi.py b/examples/retriever-multi.py
index 2bef26c..0b4b417 100644
--- a/examples/retriever-multi.py
+++ b/examples/retriever-multi.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: iso-8859-1 -*-
# vi:ts=4:et
-# $Id: retriever-multi.py,v 1.27 2005/03/15 13:10:30 kjetilja Exp $
+# $Id: retriever-multi.py,v 1.29 2005/07/28 11:04:13 mfx Exp $
#
# Usage: python retriever-multi.py <file with URLs to fetch> [<# of
diff --git a/examples/retriever.py b/examples/retriever.py
index bd20da7..ff6f807 100644
--- a/examples/retriever.py
+++ b/examples/retriever.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: iso-8859-1 -*-
# vi:ts=4:et
-# $Id: retriever.py,v 1.17 2005/02/13 08:28:01 mfx Exp $
+# $Id: retriever.py,v 1.19 2005/07/28 11:04:13 mfx Exp $
#
# Usage: python retriever.py <file with URLs to fetch> [<# of
diff --git a/examples/xmlrpc_curl.py b/examples/xmlrpc_curl.py
index a175d23..3e0bc49 100644
--- a/examples/xmlrpc_curl.py
+++ b/examples/xmlrpc_curl.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: iso-8859-1 -*-
# vi:ts=4:et
-# $Id: xmlrpc_curl.py,v 1.10 2005/02/11 11:09:12 mfx Exp $
+# $Id: xmlrpc_curl.py,v 1.12 2005/07/28 11:04:13 mfx Exp $
# We should ignore SIGPIPE when using pycurl.NOSIGNAL - see
# the libcurl tutorial for more info.
diff --git a/python/curl/__init__.py b/python/curl/__init__.py
index 13001f2..10587ad 100644
--- a/python/curl/__init__.py
+++ b/python/curl/__init__.py
@@ -132,6 +132,7 @@ class Curl:
m['os-errno'] = self.handle.getinfo(pycurl.OS_ERRNO)
m['num-connects'] = self.handle.getinfo(pycurl.NUM_CONNECTS)
m['ssl-engines'] = self.handle.getinfo(pycurl.SSL_ENGINES)
+ m['cookielist'] = self.handle.getinfo(pycurl.INFO_COOKIELIST)
return m
def answered(self, check):
diff --git a/setup.py b/setup.py
index d67f8ed..176bfa4 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.125 2005/06/14 13:43:26 kjetilja Exp $
+# $Id: setup.py,v 1.127 2005/09/05 12:05:08 kjetilja Exp $
"""Setup script for the PycURL module distribution."""
PACKAGE = "pycurl"
PY_PACKAGE = "curl"
-VERSION = "7.14.0"
+VERSION = "7.14.1"
import glob, os, re, sys, string
import distutils
@@ -170,9 +170,9 @@ setup_args = get_kw(
version=VERSION,
description="PycURL -- cURL library module for Python",
author="Kjetil Jacobsen, Markus F.X.J. Oberhumer",
- author_email="kjetilja at cs.uit.no, markus at oberhumer.com",
+ author_email="kjetilja at gmail.com, markus at oberhumer.com",
maintainer="Kjetil Jacobsen, Markus F.X.J. Oberhumer",
- maintainer_email="kjetilja at cs.uit.no, markus at oberhumer.com",
+ maintainer_email="kjetilja at gmail.com, markus at oberhumer.com",
url="http://pycurl.sourceforge.net/",
license="GNU Lesser General Public License (LGPL)",
data_files=get_data_files(),
diff --git a/setup_win32_ssl.py b/setup_win32_ssl.py
index dc3089b..f847ca9 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.30 2005/06/14 13:43:34 kjetilja Exp $
+# $Id: setup_win32_ssl.py,v 1.31 2005/09/05 12:05:08 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.14.0-ssl"
+CURL_DIR = r"c:\src\build\pycurl\curl-7.14.1-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 2a59c0d..24f6f32 100644
--- a/src/pycurl.c
+++ b/src/pycurl.c
@@ -1,4 +1,4 @@
-/* $Id: pycurl.c,v 1.92 2005/06/08 07:28:54 kjetilja Exp $ */
+/* $Id: pycurl.c,v 1.93 2005/09/05 12:05:09 kjetilja Exp $ */
/* PycURL -- cURL Python module
*
@@ -49,8 +49,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 < 0x070d02)
-# error "Need libcurl version 7.13.2 or greater to compile pycurl."
+#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x070e01)
+# error "Need libcurl version 7.14.1 or greater to compile pycurl."
#endif
#undef UNUSED
@@ -1084,6 +1084,7 @@ do_curl_setopt(CurlObject *self, PyObject *args)
case CURLOPT_CAPATH:
case CURLOPT_COOKIE:
case CURLOPT_COOKIEFILE:
+ case CURLOPT_COOKIELIST:
case CURLOPT_COOKIEJAR:
case CURLOPT_CUSTOMREQUEST:
case CURLOPT_EGDSOCKET:
@@ -1638,6 +1639,7 @@ do_curl_getinfo(CurlObject *self, PyObject *args)
}
case CURLINFO_SSL_ENGINES:
+ case CURLINFO_COOKIELIST:
{
/* Return a list of strings */
struct curl_slist *slist = NULL;
@@ -2694,6 +2696,8 @@ initpycurl(void)
insint_c(d, "SOURCE_URL", CURLOPT_SOURCE_URL);
insint_c(d, "SOURCE_QUOTE", CURLOPT_SOURCE_QUOTE);
insint_c(d, "FTP_ACCOUNT", CURLOPT_FTP_ACCOUNT);
+ insint_c(d, "IGNORE_CONTENT_LENGTH", CURLOPT_IGNORE_CONTENT_LENGTH);
+ insint_c(d, "COOKIELIST", CURLOPT_COOKIELIST);
/* constants for setopt(IPRESOLVE, x) */
insint_c(d, "IPRESOLVE_WHATEVER", CURL_IPRESOLVE_WHATEVER);
@@ -2751,6 +2755,7 @@ initpycurl(void)
insint_c(d, "OS_ERRNO", CURLINFO_OS_ERRNO);
insint_c(d, "NUM_CONNECTS", CURLINFO_NUM_CONNECTS);
insint_c(d, "SSL_ENGINES", CURLINFO_SSL_ENGINES);
+ insint_c(d, "INFO_COOKIELIST", CURLINFO_COOKIELIST);
/* curl_closepolicy: constants for setopt(CLOSEPOLICY, x) */
insint_c(d, "CLOSEPOLICY_OLDEST", CURLCLOSEPOLICY_OLDEST);
--
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