[pypy-commit] cffi release-1.9: hg merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: release-1.9
Changeset: r2817:b2c90a3b1234
Date: 2016-11-12 14:45 +0100
http://bitbucket.org/cffi/cffi/changeset/b2c90a3b1234/

Log:	hg merge default

diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c
--- a/c/_cffi_backend.c
+++ b/c/_cffi_backend.c
@@ -2,7 +2,7 @@
 #include <Python.h>
 #include "structmember.h"
 
-#define CFFI_VERSION  "1.9.0"
+#define CFFI_VERSION  "1.9.1"
 
 #ifdef MS_WIN32
 #include <windows.h>
@@ -2153,6 +2153,7 @@
 static PyObject *
 cdata_slice(CDataObject *cd, PySliceObject *slice)
 {
+    char *cdata;
     Py_ssize_t bounds[2];
     CTypeDescrObject *ct = _cdata_getslicearg(cd, slice, bounds);
     if (ct == NULL)
@@ -2165,7 +2166,7 @@
     }
     ct = (CTypeDescrObject *)ct->ct_stuff;
 
-    char *cdata = cd->c_data + ct->ct_itemdescr->ct_size * bounds[0];
+    cdata = cd->c_data + ct->ct_itemdescr->ct_size * bounds[0];
     return new_sized_cdata(cdata, ct, bounds[1]);
 }
 
diff --git a/c/test_c.py b/c/test_c.py
--- a/c/test_c.py
+++ b/c/test_c.py
@@ -12,7 +12,7 @@
 # ____________________________________________________________
 
 import sys
-assert __version__ == "1.9.0", ("This test_c.py file is for testing a version"
+assert __version__ == "1.9.1", ("This test_c.py file is for testing a version"
                                 " of cffi that differs from the one that we"
                                 " get from 'import _cffi_backend'")
 if sys.version_info < (3,):
diff --git a/cffi/__init__.py b/cffi/__init__.py
--- a/cffi/__init__.py
+++ b/cffi/__init__.py
@@ -4,8 +4,8 @@
 from .api import FFI, CDefError, FFIError
 from .ffiplatform import VerificationError, VerificationMissing
 
-__version__ = "1.9.0"
-__version_info__ = (1, 9, 0)
+__version__ = "1.9.1"
+__version_info__ = (1, 9, 1)
 
 # The verifier module file names are based on the CRC32 of a string that
 # contains the following version number.  It may be older than __version__
diff --git a/cffi/_embedding.h b/cffi/_embedding.h
--- a/cffi/_embedding.h
+++ b/cffi/_embedding.h
@@ -233,7 +233,7 @@
         f = PySys_GetObject((char *)"stderr");
         if (f != NULL && f != Py_None) {
             PyFile_WriteString("\nFrom: " _CFFI_MODULE_NAME
-                               "\ncompiled with cffi version: 1.9.0"
+                               "\ncompiled with cffi version: 1.9.1"
                                "\n_cffi_backend module: ", f);
             modules = PyImport_GetModuleDict();
             mod = PyDict_GetItemString(modules, "_cffi_backend");
diff --git a/doc/source/conf.py b/doc/source/conf.py
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -47,7 +47,7 @@
 # The short X.Y version.
 version = '1.9'
 # The full version, including alpha/beta/rc tags.
-release = '1.9.0'
+release = '1.9.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -51,13 +51,13 @@
 
 Download and Installation:
 
-* http://pypi.python.org/packages/source/c/cffi/cffi-1.9.0.tar.gz
+* http://pypi.python.org/packages/source/c/cffi/cffi-1.9.1.tar.gz
 
-   - MD5: 3806f3b4e093fa84fda0651e53bd09f1
+   - MD5: ...
 
-   - SHA: 0060819964edb18ae542cb6a04eb5fee3e8bd961
+   - SHA: ...
 
-   - SHA256: ef98626610d1c9b409da6529970a584cf88f0d1e9f3e902a569eddc1332d7864
+   - SHA256: ...
 
 * Or grab the most current version from the `Bitbucket page`_:
   ``hg clone https://bitbucket.org/cffi/cffi``
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -153,7 +153,7 @@
 
 `Mailing list <https://groups.google.com/forum/#!forum/python-cffi>`_
 """,
-        version='1.9.0',
+        version='1.9.1',
         packages=['cffi'] if cpython else [],
         package_data={'cffi': ['_cffi_include.h', 'parse_c_type.h', 
                                '_embedding.h']}