Skip to content

Commit ff0458a

Browse files
cztomczakcztomczak
committed
Updated cython setup files to display cython version.
1 parent a97b3c0 commit ff0458a

File tree

5 files changed

+23
-17
lines changed

5 files changed

+23
-17
lines changed

‎cefpython/cef3/linux/setup/setup.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
import sys
66
import platform
77
from Cython.Compiler import Options
8+
import Cython
9+
10+
print("Cython version: %s" % Cython.__version__)
811

912
BITS = platform.architecture()[0]
1013
assert (BITS == "32bit" or BITS == "64bit")
@@ -36,7 +39,7 @@ def CompileTimeConstants():
3639
["cefpython.pyx"],
3740

3841
# Ignore the warning in the console:
39-
# > C:\Python27\lib\distutils\extension.py:133: UserWarning:
42+
# > C:\Python27\lib\distutils\extension.py:133: UserWarning:
4043
# > Unknown Extension options: 'cython_directives' warnings.warn(msg)
4144
cython_directives={
4245
# Any conversion to unicode must be explicit using .decode().

‎cefpython/cef3/windows/compile.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ copy "%~dp0..\subprocess\Release\subprocess.exe" "%~dp0binaries\subprocess.exe"
4646

4747
cd binaries
4848

49-
call python "example.py"
49+
call python "wxpython.py"
5050

5151
pause

‎cefpython/cef3/windows/setup/setup.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
import sys
55
import platform
66
from Cython.Compiler import Options
7+
import Cython
8+
9+
print("Cython version: %s" % Cython.__version__)
710

811
# Stop on first error, otherwise hundreds of errors appear in the console.
912
Options.fast_fail = True
@@ -50,7 +53,7 @@ def CompileTimeConstants():
5053
["cefpython.pyx"],
5154

5255
# Ignore the warning in the console:
53-
# > C:\Python27\lib\distutils\extension.py:133: UserWarning:
56+
# > C:\Python27\lib\distutils\extension.py:133: UserWarning:
5457
# > Unknown Extension options: 'cython_directives' warnings.warn(msg)
5558
cython_directives={
5659
# Any conversion to unicode must be explicit using .decode().
@@ -59,11 +62,11 @@ def CompileTimeConstants():
5962
},
6063

6164
language='c++',
62-
65+
6366
include_dirs=[
64-
r'./../',
65-
r'./../../',
66-
r'./../../../',
67+
r'./../',
68+
r'./../../',
69+
r'./../../../',
6770
r'./../../../cython_includes/'],
6871

6972
library_dirs=[

‎cefpython/javascript_callback_cef3.pyx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ cdef class JavascriptCallback:
2727
browser.SendProcessMessage(
2828
cef_types.PID_RENDERER,
2929
self.frame.GetIdentifier(),
30-
"ExecuteJavascriptCallback",
30+
"ExecuteJavascriptCallback",
3131
[self.callbackId] + list(args))
3232
else:
3333
Debug("JavascriptCallback.Call() FAILED: browser not found, " \

‎cefpython/process_message_utils.pyx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# CEF values to Python values
77
# -----------------------------------------------------------------------------
88

9-
cdef object CheckForCefPythonMessageHash(CefRefPtr[CefBrowser] cefBrowser,
9+
cdef object CheckForCefPythonMessageHash(CefRefPtr[CefBrowser] cefBrowser,
1010
py_string pyString):
1111
# A javascript callback from the Renderer process is sent as a string.
1212
# TODO: this could be sent using CefBinaryNamedString in the future,
@@ -22,7 +22,7 @@ cdef object CheckForCefPythonMessageHash(CefRefPtr[CefBrowser] cefBrowser,
2222
if message and type(message) == dict and ("what" in message) \
2323
and message["what"] == "javascript-callback":
2424
jsCallback = CreateJavascriptCallback(
25-
message["callbackId"], cefBrowser,
25+
message["callbackId"], cefBrowser,
2626
message["frameId"], message["functionName"])
2727
return jsCallback
2828
return pyString
@@ -177,7 +177,7 @@ cdef CefRefPtr[CefListValue] PyListToCefListValue(
177177
elif valueType == long:
178178
# Int32 range is -2147483648..2147483647, we've increased the
179179
# minimum size by one as Cython was throwing a warning:
180-
# "unary minus operator applied to unsigned type, result still
180+
# "unary minus operator applied to unsigned type, result still
181181
# unsigned".
182182
if value <= 2147483647 and value >= -2147483647:
183183
ret.get().SetInt(index, int(value))
@@ -204,7 +204,7 @@ cdef CefRefPtr[CefListValue] PyListToCefListValue(
204204
else:
205205
# Raising an exception probably not a good idea, why
206206
# terminate application when we can cast it to string,
207-
# the data may contain some non-standard object that is
207+
# the data may contain some non-standard object that is
208208
# probably redundant, but casting to string will do no harm.
209209
# This will handle the "type" type.
210210
ret.get().SetString(index, PyToCefStringValue(str(value)))
@@ -234,7 +234,7 @@ cdef void PyListToExistingCefListValue(
234234
elif valueType == long:
235235
# Int32 range is -2147483648..2147483647, we've increased the
236236
# minimum size by one as Cython was throwing a warning:
237-
# "unary minus operator applied to unsigned type, result still
237+
# "unary minus operator applied to unsigned type, result still
238238
# unsigned".
239239
if value <= 2147483647 and value >= -2147483647:
240240
cefListValue.get().SetInt(index, int(value))
@@ -255,7 +255,7 @@ cdef void PyListToExistingCefListValue(
255255
if valueType == tuple:
256256
value = list(value)
257257
newCefListValue = CefListValue_Create()
258-
PyListToExistingCefListValue(browserId, frameId, value,
258+
PyListToExistingCefListValue(browserId, frameId, value,
259259
newCefListValue, nestingLevel + 1)
260260
cefListValue.get().SetList(index, newCefListValue)
261261
elif valueType == types.FunctionType or valueType == types.MethodType:
@@ -264,7 +264,7 @@ cdef void PyListToExistingCefListValue(
264264
else:
265265
# Raising an exception probably not a good idea, why
266266
# terminate application when we can cast it to string,
267-
# the data may contain some non-standard object that is
267+
# the data may contain some non-standard object that is
268268
# probably redundant, but casting to string will do no harm.
269269
# This will handle the "type" type.
270270
cefListValue.get().SetString(index, PyToCefStringValue(str(value)))
@@ -294,7 +294,7 @@ cdef CefRefPtr[CefDictionaryValue] PyDictToCefDictionaryValue(
294294
elif valueType == long:
295295
# Int32 range is -2147483648..2147483647, we've increased the
296296
# minimum size by one as Cython was throwing a warning:
297-
# "unary minus operator applied to unsigned type, result still
297+
# "unary minus operator applied to unsigned type, result still
298298
# unsigned".
299299
if value <= 2147483647 and value >= -2147483647:
300300
ret.get().SetInt(cefKey, int(value))
@@ -321,7 +321,7 @@ cdef CefRefPtr[CefDictionaryValue] PyDictToCefDictionaryValue(
321321
else:
322322
# Raising an exception probably not a good idea, why
323323
# terminate application when we can cast it to string,
324-
# the data may contain some non-standard object that is
324+
# the data may contain some non-standard object that is
325325
# probably redundant, but casting to string will do no harm.
326326
# This will handle the "type" type.
327327
ret.get().SetString(cefKey, PyToCefStringValue(str(value)))

0 commit comments

Comments
 (0)