[Python-modules-commits] [pycurl] 07/09: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Mon Apr 27 20:26:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository pycurl.
commit c681c2d5b3bd5a4868c46676d941224cfbed1c2a
Merge: d36b9c1 7e232ee
Author: Barry Warsaw <barry at python.org>
Date: Mon Apr 27 16:12:09 2015 -0400
merge patched into master
AUTHORS | 1 +
ChangeLog | 22 +-
MANIFEST.in | 9 +
PKG-INFO | 2 +-
RELEASE-NOTES.rst | 7 +
debian/.git-dpm | 6 +-
debian/patches/0003-upstream-issue-210.patch | 7 +-
debian/patches/10_setup.py.patch | 4 +-
debian/patches/20_build_doc_for_debian.patch | 2 +-
doc/conf.py | 4 +-
examples/linksys.py | 0
examples/smtp.py | 39 +++
requirements-dev-2.4.txt | 2 +
requirements-dev-2.5.txt | 2 +
requirements-dev.txt | 4 +
setup.py | 4 +-
src/easy.c | 17 +
src/module.c | 17 +
src/pycurl.h | 16 +
tests/__init__.py | 8 +
tests/app.py | 113 ++++++
tests/appmanager.py | 56 +++
tests/certinfo_test.py | 67 ++++
tests/certs/server.crt | 14 +
tests/certs/server.key | 15 +
tests/curl_object_test.py | 27 ++
tests/debug_test.py | 52 +++
tests/default_write_function_test.py | 84 +++++
tests/error_constants_test.py | 21 ++
tests/error_test.py | 82 +++++
tests/ext/test-lib.sh | 69 ++++
tests/ext/test-suite.sh | 25 ++
tests/fake-curl/curl-config-empty | 15 +
tests/fake-curl/curl-config-libs-and-static-libs | 17 +
tests/fake-curl/curl-config-ssl-feature-only | 18 +
tests/fake-curl/curl-config-ssl-in-libs | 14 +
tests/fake-curl/curl-config-ssl-in-static-libs | 17 +
tests/fixtures/form_submission.txt | 1 +
tests/ftp_test.py | 53 +++
tests/functools_backport.py | 58 ++++
tests/getinfo_test.py | 52 +++
tests/global_init_test.py | 31 ++
tests/header_function_test.py | 49 +++
tests/header_test.py | 49 +++
tests/info_constants_test.py | 16 +
tests/internals_test.py | 225 ++++++++++++
tests/matrix.py | 214 ++++++++++++
tests/matrix/curl-7.19.0-sslv2-2b0e09b0f98.patch | 40 +++
.../curl-7.19.0-sslv2-c66b0b32fba-modified.patch | 29 ++
tests/matrix/python25.patch | 67 ++++
tests/matrix/python30.patch | 19 ++
tests/memory_mgmt_test.py | 261 ++++++++++++++
tests/multi_memory_mgmt_test.py | 35 ++
tests/multi_option_constants_test.py | 24 ++
tests/multi_socket_select_test.py | 120 +++++++
tests/multi_socket_test.py | 97 ++++++
tests/multi_test.py | 379 +++++++++++++++++++++
tests/multi_timer_test.py | 90 +++++
tests/option_constants_test.py | 149 ++++++++
tests/pause_test.py | 93 +++++
tests/post_test.py | 125 +++++++
tests/procmgr.py | 101 ++++++
tests/protocol_constants_test.py | 48 +++
tests/pycurl_object_test.py | 125 +++++++
tests/read_callback_test.py | 126 +++++++
tests/readdata_test.py | 160 +++++++++
tests/relative_url_test.py | 22 ++
tests/reload_test.py | 20 ++
tests/reset_test.py | 88 +++++
tests/resolve_test.py | 26 ++
tests/runwsgi.py | 129 +++++++
tests/seek_function_constants_test.py | 31 ++
tests/seek_function_test.py | 77 +++++
tests/setopt_lifecycle_test.py | 58 ++++
tests/setopt_test.py | 42 +++
tests/setopt_unicode_test.py | 41 +++
tests/setup_test.py | 103 ++++++
tests/share_test.py | 71 ++++
tests/socket_open_test.py | 48 +++
tests/unset_range_test.py | 51 +++
tests/user_agent_string_test.py | 27 ++
tests/util.py | 183 ++++++++++
tests/version_comparison_test.py | 15 +
tests/version_test.py | 13 +
tests/vsftpd.conf | 13 +
tests/write_abort_test.py | 40 +++
tests/write_cb_bogus_test.py | 47 +++
tests/write_test.py | 94 +++++
tests/write_to_stringio_test.py | 41 +++
winbuild.py | 2 +-
90 files changed, 4980 insertions(+), 17 deletions(-)
diff --cc debian/.git-dpm
index 354c073,0000000..426f8a8
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 9456098cc34953157aceccb4b235cf8201a900fe
- 9456098cc34953157aceccb4b235cf8201a900fe
- 31bfa35a9b88bd353aeb97784ac8de4c49755f08
++7e232eecf5078c81d910a03717b440a5e2af7416
++7e232eecf5078c81d910a03717b440a5e2af7416
++4d69da98db3a3dfb2b4e3a7a9edb2b9fd0469013
+4d69da98db3a3dfb2b4e3a7a9edb2b9fd0469013
+pycurl_7.19.5.1.orig.tar.gz
+e448cc05ef05f8645bb9a7873d7a7e0b0035db14
+142140
diff --cc debian/patches/0003-upstream-issue-210.patch
index 4d993bc,0000000..23ec599
mode 100644,000000..100644
--- a/debian/patches/0003-upstream-issue-210.patch
+++ b/debian/patches/0003-upstream-issue-210.patch
@@@ -1,26 -1,0 +1,25 @@@
- From 9456098cc34953157aceccb4b235cf8201a900fe Mon Sep 17 00:00:00 2001
++From 7e232eecf5078c81d910a03717b440a5e2af7416 Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at python.org>
+Date: Tue, 14 Oct 2014 16:25:57 -0400
+Subject: upstream issue 210
- Bug: https://github.com/pycurl/pycurl/issues/210
+
+---
+ src/easy.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/easy.c b/src/easy.c
- index 6f1ba1d..fe52b18 100644
++index e521de4..2a7d361 100644
+--- a/src/easy.c
++++ b/src/easy.c
- @@ -926,7 +926,11 @@ debug_callback(CURL *curlobj, curl_infotype type,
++@@ -929,7 +929,11 @@ debug_callback(CURL *curlobj, curl_infotype type,
+ }
+
+ /* run callback */
++#if PY_MAJOR_VERSION >= 3
++ arglist = Py_BuildValue("(iy#)", (int)type, buffer, (int)total_size);
++#else
+ arglist = Py_BuildValue("(is#)", (int)type, buffer, (int)total_size);
++#endif
+ if (arglist == NULL)
+ goto verbose_error;
+ result = PyEval_CallObject(self->debug_cb, arglist);
diff --cc debian/patches/10_setup.py.patch
index 5cc0c62,0000000..93b9521
mode 100644,000000..100644
--- a/debian/patches/10_setup.py.patch
+++ b/debian/patches/10_setup.py.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 8ec889ff26d895a712a502018c540b78552bf646 Mon Sep 17 00:00:00 2001
++From 7a42ba2efaaf5953e91d9dac5c0c6dde7fffdfda Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Tue, 30 Sep 2014 17:38:05 -0400
+Subject: Adjust setup.py file for Debian architecture
+
+Patch-Name: 10_setup.py.patch
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
- index 6215dfa..6f778f7 100644
++index 9cb0667..90f5b04 100644
+--- a/setup.py
++++ b/setup.py
+@@ -54,7 +54,7 @@ def scan_argv(s, default=None):
+ class ExtensionConfiguration(object):
+ def __init__(self):
+ self.include_dirs = []
+- self.define_macros = [("PYCURL_VERSION", '"%s"' % VERSION)]
++ self.define_macros = [("PYCURL_VERSION", '"%s"' % VERSION), ('HAVE_CURL_GNUTLS', 1) ]
+ self.library_dirs = []
+ self.libraries = []
+ self.runtime_library_dirs = []
diff --cc debian/patches/20_build_doc_for_debian.patch
index 1e1d14e,0000000..c0c0a7c
mode 100644,000000..100644
--- a/debian/patches/20_build_doc_for_debian.patch
+++ b/debian/patches/20_build_doc_for_debian.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 36f7b931a1363416d3256b98bf59474c37007fc1 Mon Sep 17 00:00:00 2001
++From a4111adc2a24bfd0f2c7ebc0a4b6f0c67a6e3434 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Tue, 30 Sep 2014 17:38:05 -0400
+Subject: Adapt documentation build process for Debian packaging purposes
+
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2014-02-15
+Patch-Name: 20_build_doc_for_debian.patch
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index 99120e7..5a2ba47 100644
+--- a/Makefile
++++ b/Makefile
+@@ -142,6 +142,7 @@ docs: build
+ PYTHONSUFFIX=$$(python -V 2>&1 |awk '{print $$2}' |awk -F. '{print $$1 "." $$2}') && \
+ PYTHONPATH=$$(ls -d build/lib.*$$PYTHONSUFFIX):$$PYTHONPATH \
+ sphinx-build doc build/doc
++ rst2html README.rst build/doc/README.html
+
+ # Rebuild all documentation.
+ # As sphinx extracts documentation from pycurl modules, docs targets
--
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