[pypy-commit] pypy release-2.0-beta2: merge default
fijal
noreply at buildbot.pypy.org
Fri Apr 5 13:31:36 CEST 2013
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: release-2.0-beta2
Changeset: r63053:da4d2a8bc441
Date: 2013-04-05 13:31 +0200
http://bitbucket.org/pypy/pypy/changeset/da4d2a8bc441/
Log: merge default
diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -1167,7 +1167,7 @@
if ret == _lib.SQLITE_OK and not self._statement:
# an empty statement, work around that, as it's the least trouble
- c_sql = _ffi.new("char[]", "select 42")
+ c_sql = _ffi.new("char[]", b"select 42")
ret = _lib.sqlite3_prepare_v2(self.__con._db, c_sql, -1,
statement_star, next_char)
self._statement = statement_star[0]
diff --git a/lib_pypy/cffi/api.py b/lib_pypy/cffi/api.py
--- a/lib_pypy/cffi/api.py
+++ b/lib_pypy/cffi/api.py
@@ -25,6 +25,7 @@
line = ''
return '%s%s' % (line, self.args[0])
+
class FFI(object):
r'''
The main top-level class that you instantiate once, or once per module.
@@ -220,7 +221,7 @@
it as a string or unicode string.
If 'cdata' is an enum, returns the value of the enumerator as a
- string, or '#NUMBER' if the value is out of range.
+ string, or 'NUMBER' if the value is out of range.
"""
return self._backend.string(cdata, maxlen)
diff --git a/lib_pypy/cffi/cparser.py b/lib_pypy/cffi/cparser.py
--- a/lib_pypy/cffi/cparser.py
+++ b/lib_pypy/cffi/cparser.py
@@ -2,7 +2,7 @@
from . import api, model
from .commontypes import COMMON_TYPES, resolve_common_type
try:
- from cffi import _pycparser as pycparser
+ from . import _pycparser as pycparser
except ImportError:
import pycparser
import weakref, re, sys
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_module/setup.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_module/setup.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_module/setup.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_module/setup.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from distutils.core import setup
import snip_basic_verify
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_module/snip_basic_verify.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_module/snip_basic_verify.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_module/snip_basic_verify.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_module/snip_basic_verify.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from cffi import FFI
import sys
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_1/setup.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_1/setup.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_1/setup.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_1/setup.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from distutils.core import setup
import snip_basic_verify1
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_1/snip_basic_verify1/__init__.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_1/snip_basic_verify1/__init__.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_1/snip_basic_verify1/__init__.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_1/snip_basic_verify1/__init__.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from cffi import FFI
import sys
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_2/setup.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_2/setup.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_2/setup.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_2/setup.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from distutils.core import setup
import snip_basic_verify2
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_2/snip_basic_verify2/__init__.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_2/snip_basic_verify2/__init__.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_2/snip_basic_verify2/__init__.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/distutils_package_2/snip_basic_verify2/__init__.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from cffi import FFI
import sys
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/infrastructure/setup.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/infrastructure/setup.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/infrastructure/setup.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/infrastructure/setup.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from distutils.core import setup
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/infrastructure/snip_infrastructure/__init__.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/infrastructure/snip_infrastructure/__init__.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/infrastructure/snip_infrastructure/__init__.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/infrastructure/snip_infrastructure/__init__.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
def func():
return 42
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_module/setup.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_module/setup.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_module/setup.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_module/setup.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from setuptools import setup
import snip_setuptools_verify
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_module/snip_setuptools_verify.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_module/snip_setuptools_verify.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_module/snip_setuptools_verify.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_module/snip_setuptools_verify.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from cffi import FFI
import sys
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_1/setup.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_1/setup.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_1/setup.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_1/setup.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from setuptools import setup
import snip_setuptools_verify1
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_1/snip_setuptools_verify1/__init__.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_1/snip_setuptools_verify1/__init__.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_1/snip_setuptools_verify1/__init__.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_1/snip_setuptools_verify1/__init__.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from cffi import FFI
import sys
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_2/setup.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_2/setup.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_2/setup.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_2/setup.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from setuptools import setup
import snip_setuptools_verify2
diff --git a/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_2/snip_setuptools_verify2/__init__.py b/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_2/snip_setuptools_verify2/__init__.py
--- a/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_2/snip_setuptools_verify2/__init__.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/snippets/setuptools_package_2/snip_setuptools_verify2/__init__.py
@@ -1,3 +1,4 @@
+# Generated by pypy/tool/import_cffi.py
from cffi import FFI
import sys
More information about the pypy-commit
mailing list