Author: svn-role
Date: Tue Jan 9 04:00:08 2018
New Revision: 1820621
URL: http://svn.apache.org/viewvc?rev=1820621&view=rev
Log:
Merge r1820518 from trunk:
* r1820518
swig-py: Support raw binary file-like objects for readable svn_stream_t*
parameters. [D:bindings]
Justification:
Allow passing any file-like object for an svn_stream_t* parameter, as
implicitly permitted by the docstring of svn.core.Stream and comment of
'%ignore svn_stream_create;'.
Votes:
+1: danielsh, brane
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 9 04:00:08 2018
@@ -99,4 +99,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820518
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1820621&r1=1820620&r2=1820621&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Jan 9 04:00:08 2018
@@ -20,13 +20,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1820518
- swig-py: Support raw binary file-like objects for readable svn_stream_t*
- parameters. [D:bindings]
- Justification:
- Allow passing any file-like object for an svn_stream_t* parameter, as
- implicitly permitted by the docstring of svn.core.Stream and comment of
- '%ignore svn_stream_create;'.
- Votes:
- +1: danielsh, brane
Modified:
subversion/branches/1.10.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1820621&r1=1820620&r2=1820621&view=diff
==============================================================================
---
subversion/branches/1.10.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
(original)
+++
subversion/branches/1.10.x/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Tue Jan 9 04:00:08 2018
@@ -2578,8 +2578,7 @@ svn_swig_py_make_stream(PyObject *py_io,
svn_stream_t *stream;
stream = svn_stream_create(py_io, pool);
- svn_stream_set_read2(stream, NULL /* only full read support */,
- read_handler_pyio);
+ svn_stream_set_read2(stream, read_handler_pyio, NULL);
svn_stream_set_write(stream, write_handler_pyio);
svn_stream_set_close(stream, close_handler_pyio);
apr_pool_cleanup_register(pool, py_io, svn_swig_py_stream_destroy,
