Author: Armin Rigo <[email protected]>
Branch: release-1.0
Changeset: r2098:305439fab459
Date: 2015-05-25 18:03 +0200
http://bitbucket.org/cffi/cffi/changeset/305439fab459/
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
@@ -6050,7 +6050,7 @@
if (v == NULL || PyModule_AddObject(m, "_C_API", v) < 0)
INITERROR;
- v = PyText_FromString("1.0.2");
+ v = PyText_FromString("1.0.3");
if (v == NULL || PyModule_AddObject(m, "__version__", v) < 0)
INITERROR;
diff --git a/c/test_c.py b/c/test_c.py
--- a/c/test_c.py
+++ b/c/test_c.py
@@ -3346,4 +3346,4 @@
def test_version():
# this test is here mostly for PyPy
- assert __version__ == "1.0.2"
+ assert __version__ == "1.0.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.0.2"
-__version_info__ = (1, 0, 2)
+__version__ = "1.0.3"
+__version_info__ = (1, 0, 3)
# 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/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.0'
# The full version, including alpha/beta/rc tags.
-release = '1.0.2'
+release = '1.0.3'
# 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.0.2.tar.gz
+* http://pypi.python.org/packages/source/c/cffi/cffi-1.0.3.tar.gz
- Or grab the most current version by following the instructions below.
- - MD5: 980de2d037df6b9602389529744b5ac8
+ - MD5: ...
- - SHA: 721f1cbaa79cb7304a5eb54f5af86b737b6779cd
+ - SHA: ...
* Or get it from the `Bitbucket page`_:
``hg clone https://bitbucket.org/cffi/cffi``
diff --git a/doc/source/overview.rst b/doc/source/overview.rst
--- a/doc/source/overview.rst
+++ b/doc/source/overview.rst
@@ -35,6 +35,8 @@
>>> arg = ffi.new("char[]", "world") # equivalent to C code: char
arg[] = "world";
>>> C.printf("hi there, %s!\n", arg) # call printf
hi there, world!
+ 17 # this is the return value
+ >>>
Note that on Python 3 you need to pass byte strings to ``char *``
arguments. In the above example it would be ``b"world"`` and ``b"hi
@@ -120,7 +122,7 @@
""",
libraries=[]) # or a list of libraries to link with
- ffi.cdef(""" // some declarations from the man page
+ ffi.cdef(""" // some declarations from the man page
struct passwd {
char *pw_name;
...; // literally dot-dot-dot
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -144,7 +144,7 @@
`Mailing list <https://groups.google.com/forum/#!forum/python-cffi>`_
""",
- version='1.0.2',
+ version='1.0.3',
packages=['cffi'] if cpython else [],
package_data={'cffi': ['_cffi_include.h', 'parse_c_type.h']}
if cpython else {},
diff --git a/testing/cffi1/test_verify1.py b/testing/cffi1/test_verify1.py
--- a/testing/cffi1/test_verify1.py
+++ b/testing/cffi1/test_verify1.py
@@ -1,4 +1,4 @@
-import sys, math, py
+import os, sys, math, py
from cffi import FFI, VerificationError, VerificationMissing, model
from cffi import recompiler
from testing.support import *
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
