[pypy-commit] cffi default: P: cffi must be compatible with 3.2
vyskocilm
pypy.commits at gmail.com
Thu Jan 31 04:27:03 EST 2019
Author: Michal Vyskocil <michal.vyskocil at gmail.com>
Branch:
Changeset: r3202:d2065033e33b
Date: 2019-01-10 13:30 +0100
http://bitbucket.org/cffi/cffi/changeset/d2065033e33b/
Log: P: cffi must be compatible with 3.2
S: can't use u prefixes, as it is syntax error there
diff --git a/cffi/pkgconfig.py b/cffi/pkgconfig.py
--- a/cffi/pkgconfig.py
+++ b/cffi/pkgconfig.py
@@ -62,7 +62,7 @@
Raises
* PkgConfigNotFound if pkg-config is not installed
- * PkgConfigModuleNotFound if requested module not found
+ * PkgConfigModuleNotFoun if requested module not found
* PkgConfigModuleVersionNotFound if requested version does not match
* PkgConfigError for all other errors
"""
@@ -76,18 +76,18 @@
# drop starting -I -L -l from cflags
def dropILl(string):
def _dropILl(string):
- if string.startswith(u"-I") or string.startswith(u"-L") or string.startswith(u"-l"):
+ if string.startswith("-I") or string.startswith("-L") or string.startswith("-l"):
return string [2:]
return [_dropILl(x) for x in string.split()]
# convert -Dfoo=bar to list of tuples [("foo", "bar")] expected by cffi
def macros(string):
def _macros(string):
- return tuple(string [2:].split(u"=", 2))
- return [_macros(x) for x in string.split() if x.startswith(u"-D")]
+ return tuple(string [2:].split("=", 2))
+ return [_macros(x) for x in string.split() if x.startswith("-D")]
def drop_macros(string):
- return [x for x in string.split() if not x.startswith(u"-D")]
+ return [x for x in string.split() if not x.startswith("-D")]
# return kwargs for given libname
def kwargs(libname):
More information about the pypy-commit
mailing list