[Python-modules-commits] [pycurl] 54/140: Import pycurl_7.15.5.orig.tar.gz

[Barry Warsaw]

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository pycurl.

commit 44afe691b78d0f7a6229f4feabf833698100bd80
Author: Barry Warsaw <barry at python.org>
Date:   Wed Oct 1 16:43:36 2014 -0400

    Import pycurl_7.15.5.orig.tar.gz
---
 ChangeLog          | 10 +++++++++-
 PKG-INFO           |  2 +-
 setup.py           |  7 +++++--
 setup_win32_ssl.py |  4 ++--
 src/pycurl.c       | 12 ++++++++----
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c3d4cd2..8188209 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-Version 7.15.4.2 [requires libcurl-7.15.4 or better]
+Version 7.15.5 [requires libcurl-7.15.5 or better]
+--------------
+
+        * Added CURLOPT_FTP_ALTERNATIVE_TO_USER,
+          CURLOPT_MAX_SEND_SPEED_LARGE,
+          and CURLOPT_MAX_RECV_SPEED_LARGE.
+
+
+Version 7.15.4.2
 ----------------
 
         * Use SSL locking callbacks, fixes random
diff --git a/PKG-INFO b/PKG-INFO
index 954cb79..2ed46fb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: pycurl
-Version: 7.15.4.2
+Version: 7.15.5
 Summary: PycURL -- cURL library module for Python
 Home-page: http://pycurl.sourceforge.net/
 Author: Kjetil Jacobsen, Markus F.X.J. Oberhumer
diff --git a/setup.py b/setup.py
index a55bc25..8b68895 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.134 2006/07/05 06:52:19 kjetilja Exp $
+# $Id: setup.py,v 1.136 2006/08/10 11:41:16 kjetilja Exp $
 
 """Setup script for the PycURL module distribution."""
 
 PACKAGE = "pycurl"
 PY_PACKAGE = "curl"
-VERSION = "7.15.4.2"
+VERSION = "7.15.5"
 
 import glob, os, re, sys, string
 import distutils
@@ -78,6 +78,9 @@ if sys.platform == "win32":
         extra_link_args.append("/opt:nowin98")  # use small section alignment
 else:
     # Find out the rest the hard way
+    OPENSSL_DIR = scan_argv("--openssl-dir=", "")
+    if OPENSSL_DIR != "":
+        include_dirs.append(os.path.join(OPENSSL_DIR, "include"))
     CURL_CONFIG = "curl-config"
     CURL_CONFIG = scan_argv("--curl-config=", CURL_CONFIG)
     d = os.popen("'%s' --version" % CURL_CONFIG).read()
diff --git a/setup_win32_ssl.py b/setup_win32_ssl.py
index b86499e..5717233 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.36 2006/07/03 13:16:00 kjetilja Exp $
+# $Id: setup_win32_ssl.py,v 1.37 2006/08/10 11:41:16 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.15.4-ssl"
+CURL_DIR = r"c:\src\build\pycurl\curl-7.15.5-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 8f48d10..674ca23 100644
--- a/src/pycurl.c
+++ b/src/pycurl.c
@@ -1,9 +1,9 @@
-/* $Id: pycurl.c,v 1.112 2006/07/05 06:52:19 kjetilja Exp $ */
+/* $Id: pycurl.c,v 1.114 2006/08/10 11:41:16 kjetilja Exp $ */
 
 /* PycURL -- cURL Python module
  *
  * Authors:
- *  Copyright (C) 2001-2006 by Kjetil Jacobsen <kjetilja at cs.uit.no>
+ *  Copyright (C) 2001-2006 by Kjetil Jacobsen <kjetilja at gmail.com>
  *  Copyright (C) 2001-2006 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
  *
  * Contributions:
@@ -47,8 +47,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 < 0x070f04)
-#  error "Need libcurl version 7.15.4 or greater to compile pycurl."
+#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x070f05)
+#  error "Need libcurl version 7.15.5 or greater to compile pycurl."
 #endif
 
 #undef UNUSED
@@ -1477,6 +1477,7 @@ do_curl_setopt(CurlObject *self, PyObject *args)
         case CURLOPT_SOURCE_HOST:
         case CURLOPT_SOURCE_USERPWD:
         case CURLOPT_SOURCE_PATH:
+        case CURLOPT_FTP_ALTERNATIVE_TO_USER:
 /* FIXME: check if more of these options allow binary data */
             str = PyString_AsString_NoNUL(obj);
             if (str == NULL)
@@ -3193,6 +3194,9 @@ initpycurl(void)
     insint_c(d, "CONNECT_ONLY", CURLOPT_CONNECT_ONLY);
     insint_c(d, "LOCALPORT", CURLOPT_LOCALPORT);
     insint_c(d, "LOCALPORTRANGE", CURLOPT_LOCALPORTRANGE);
+    insint_c(d, "FTP_ALTERNATIVE_TO_USER", CURLOPT_FTP_ALTERNATIVE_TO_USER);
+    insint_c(d, "MAX_SEND_SPEED_LARGE", CURLOPT_MAX_SEND_SPEED_LARGE);
+    insint_c(d, "MAX_RECV_SPEED_LARGE", CURLOPT_MAX_RECV_SPEED_LARGE);
 
     /* constants for setopt(IPRESOLVE, x) */
     insint_c(d, "IPRESOLVE_WHATEVER", CURL_IPRESOLVE_WHATEVER);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pycurl.git