Python 3 compatibility fixes - there is no dict.has_key() method.

cztomczak · cztomczak · commit 471108fa094d · 2013-08-06T15:38:22.000+02:00
diff --git a/cefpython/browser.pyx b/cefpython/browser.pyx
@@ -21,7 +21,7 @@ cdef dict g_pyBrowsers = {}
 IF CEF_VERSION == 3:
     # Unused function warning in CEF 1.
     cdef PyBrowser GetPyBrowserById(int browserId):
-        if g_pyBrowsers.has_key(browserId):
+        if browserId in g_pyBrowsers:
             return g_pyBrowsers[browserId]
         return None
 
@@ -87,7 +87,7 @@ IF CEF_VERSION == 3:
         # Called from LifespanHandler_OnBeforeClose().
         # TODO: call this function also in CEF 1.
         global g_pyBrowsers
-        if g_pyBrowsers.has_key(browserId):
+        if browserId in g_pyBrowsers:
             Debug("del g_pyBrowsers[%s]" % browserId)
             del g_pyBrowsers[browserId]
         else:
diff --git a/cefpython/cef1/windows/binaries/panda3d_.py b/cefpython/cef1/windows/binaries/panda3d_.py
@@ -247,10 +247,10 @@ def onKeystroke(self, key):
                 self.keyInfo(ord(key)), 0)
 
     def onButtonDownOrUp(self, keyType, key):
-        if self.modifierKeys.has_key(key):
+        if key in self.modifierKeys:
             self.keyModifiers |= self.modifierKeys[key]
         else:
-            if self.translateKeys.has_key(key):
+            if key in self.translateKeys:
                 self.browser.SendKeyEvent(keyType,
                         self.keyInfo(self.translateKeys[key]),
                         self.keyModifiers)
diff --git a/cefpython/cefpython.pyx b/cefpython/cefpython.pyx
@@ -307,7 +307,7 @@ cpdef py_void SetGlobalClientCallback(py_string name, object callback):
 
 cpdef object GetGlobalClientCallback(py_string name):
     global g_globalClientCallbacks
-    if g_globalClientCallbacks.has_key(name):
+    if name in g_globalClientCallbacks:
         return g_globalClientCallbacks[name]
     else:
         return None
diff --git a/cefpython/frame.pyx b/cefpython/frame.pyx
@@ -7,7 +7,7 @@ cdef dict g_pyFrames = {}
 IF CEF_VERSION == 3:
     # Unused function warning in CEF 1.
     cdef PyFrame GetPyFrameById(object frameId):
-        if g_pyFrames.has_key(frameId):
+        if frameId in g_pyFrames:
             return g_pyFrames[frameId]
         return None
 
@@ -45,7 +45,7 @@ IF CEF_VERSION == 3:
         # Called from V8ContextHandler_OnContextReleased().
         # TODO: call this function also in CEF 1.
         global g_pyFrames
-        if g_pyFrames.has_key(frameId):
+        if frameId in g_pyFrames:
             Debug("del g_pyFrames[%s]" % frameId)
             del g_pyFrames[frameId]
         else:
diff --git a/cefpython/process_message_utils.pyx b/cefpython/process_message_utils.pyx
@@ -19,7 +19,7 @@ cdef object CheckForCefPythonMessageHash(CefRefPtr[CefBrowser] cefBrowser,
     if pyString.startswith(cefPythonMessageHash):
         jsonData = pyString[len(cefPythonMessageHash):]
         message = json.loads(jsonData)
-        if message and type(message) == dict and message.has_key("what") \
+        if message and type(message) == dict and ("what" in message) \
                 and message["what"] == "javascript-callback":
             jsCallback = CreateJavascriptCallback(
                     message["callbackId"], cefBrowser, 
diff --git a/cefpython/python_callback_cef3.pyx b/cefpython/python_callback_cef3.pyx
@@ -73,7 +73,7 @@ cdef public cpp_bool ExecutePythonCallback(
     cdef object returnValue
     try:
         global g_pythonCallbacks
-        if g_pythonCallbacks.has_key(callbackId):
+        if callbackId in g_pythonCallbacks:
             # [0] browserId, [1] frameId, [2] function.
             function = g_pythonCallbacks[callbackId][2]
             functionArguments = CefListValueToPyList(
