Fix compilation error using python2.7

[python-purple] / request_cbs.pxd

diff --git a/request_cbs.pxd b/request_cbs.pxd
index fd98e02..ca0f661 100644 (file)
--- a/request_cbs.pxd
+++ b/request_cbs.pxd
@@ -17,8 +17,6 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-cimport purple
-
 cdef extern from *:
     ctypedef char const_char "const char"
     ctypedef int size_t
@@ -44,7 +42,7 @@ cdef void *request_input(const_char *title, const_char *primary, \
     @see purple_request_input().
     """
     debug.purple_debug_info("request", "%s", "request-input\n")
-    if request_cbs.has_key("request-input"):
+    if "request-input" in request_cbs:
         (<object> request_cbs["request-input"])("request-input: TODO")
 
 cdef void *request_choice(const_char *title, const_char *primary, \
@@ -57,7 +55,7 @@ cdef void *request_choice(const_char *title, const_char *primary, \
     @see purple_request_choice_varg().
     """
     debug.purple_debug_info("request", "%s", "request-choice\n")
-    if request_cbs.has_key("request-choice"):
+    if "request-choice" in request_cbs:
         (<object> request_cbs["request-choice"])("request-choice: TODO")
 
 cdef void __call_action(int i):
@@ -99,10 +97,10 @@ cdef void *request_action(const_char *title, const_char *primary, \
         i = i + 1
 
     debug.purple_debug_info("request", "%s", "request-action\n")
-    if request_cbs.has_key("request-action"):
-        (<object> request_cbs["request-action"])(<char *> title,
-                       <char *> primary, <char *> secondary,
-                       default_action, req_actions_list)
+    if "request-action" in request_cbs:
+        (<object> request_cbs["request-action"]) \
+            (<char *> title, <char *> primary, <char *> secondary, \
+            default_action, req_actions_list)
 
 cdef void *request_fields(const_char *title, const_char *primary, \
         const_char *secondary, request.PurpleRequestFields *fields, \
@@ -114,7 +112,7 @@ cdef void *request_fields(const_char *title, const_char *primary, \
     @see purple_request_fields().
     """
     debug.purple_debug_info("request", "%s", "request-fields\n")
-    if request_cbs.has_key("request-fields"):
+    if "request-fields" in request_cbs:
         (<object> request_cbs["request-fields"])("request-fields: TODO")
 
 cdef void *request_file(const_char *title, const_char *filename, \
@@ -126,7 +124,7 @@ cdef void *request_file(const_char *title, const_char *filename, \
     @see purple_request_file().
     """
     debug.purple_debug_info("request", "%s", "request-file\n")
-    if request_cbs.has_key("request-file"):
+    if "request-file" in request_cbs:
         (<object> request_cbs["request-file"])("request-file: TODO")
 
 cdef void close_request(request.PurpleRequestType type, void *ui_handle):
@@ -134,7 +132,7 @@ cdef void close_request(request.PurpleRequestType type, void *ui_handle):
     TODO
     """
     debug.purple_debug_info("request", "%s", "close-request\n")
-    if request_cbs.has_key("close-request"):
+    if "close-request" in request_cbs:
         (<object> request_cbs["close-request"])("close-request: TODO")
 
 cdef void *request_folder(const_char *title, const_char *dirname, \
@@ -145,5 +143,5 @@ cdef void *request_folder(const_char *title, const_char *dirname, \
     @see purple_request_folder().
     """
     debug.purple_debug_info("request", "%s", "request-folder\n")
-    if request_cbs.has_key("request-folder"):
+    if "request-folder" in request_cbs:
         (<object> request_cbs["request-folder"])("request-folder: TODO")