Merge branch 'release'

CHANGES.rst

@@ -51,7 +51,7 @@ Bugs fixed
   (Github issue #1837)
 
 
-0.26.1 (2017-??-??)
+0.26.1 (2017-08-28)
 ===================
 
 Features added
@@ -67,14 +67,20 @@ Bugs fixed
   a reference to the buffer owner on release, thus not freeing the memory.
   (Github issue #1638)
 
+* Auto-decoding failed in 0.26 for strings inside of C++ containers.
+  (Github issue #1790)
+
+* Compile error when inheriting from C++ container types.
+  (Github issue #1788)
+
 * Invalid C code in generators (declaration after code).
   (Github issue #1801)
 
 * Arithmetic operations on ``const`` integer variables could generate invalid code.
-  (Github issue #1798).
+  (Github issue #1798)
 
 * Local variables with names of special Python methods failed to compile inside of
-  closures (Github issue #1797).
+  closures. (Github issue #1797)
 
 * Problem with indirect Emacs buffers in cython-mode.
   Patch by Martin Albrecht (Github issue #1743).

tests/run/cpp_stl_string_ascii_auto_encoding.pyx

@@ -2,9 +2,8 @@
 # tag: cpp, werror
 # cython: c_string_encoding=ascii, c_string_type=unicode
 
-cimport cython
-
 from libcpp.string cimport string
+from libcpp.vector cimport vector
 
 b_asdf = b'asdf'
 s_asdf = 'asdf'
@@ -148,3 +147,17 @@ def test_str_cast(a):
     cdef string s = a
     assert s.length() == <size_t>len(a), "%d != %d" % (s.length(), len(a))
     return <str>s
+
+
+def test_vector_of_strings(*strings):
+    """
+    >>> results = test_vector_of_strings(b_asdf, u_asdf)
+    >>> results == [u_asdf, u_asdf] or results
+    True
+    >>> type(results[0]) is type(u_asdf) or type(results[0])
+    True
+    >>> type(results[1]) is type(u_asdf) or type(results[1])
+    True
+    """
+    cdef vector[string] v = strings
+    return v