SOURCES: python-pyevent-python25.patch (NEW) - patch for python 2....

patrys patrys at pld-linux.org
Wed Jan 30 21:39:45 CET 2008


Author: patrys                       Date: Wed Jan 30 20:39:45 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- patch for python 2.5 from orbited.org

---- Files affected:
SOURCES:
   python-pyevent-python25.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/python-pyevent-python25.patch
diff -u /dev/null SOURCES/python-pyevent-python25.patch:1.1
--- /dev/null	Wed Jan 30 21:39:45 2008
+++ SOURCES/python-pyevent-python25.patch	Wed Jan 30 21:39:40 2008
@@ -0,0 +1,1238 @@
+--- pyevent-0.3/event.c	2005-09-12 05:16:58.000000000 +0200
++++ pyevent-0.3/event.c.new	2008-01-30 21:34:35.203333139 +0100
+@@ -1,17 +1,31 @@
+-/* Generated by Pyrex 0.9.3 on Sun Sep 11 23:51:17 2005 */
++/* Generated by Pyrex 0.9.4.1 on Tue Aug  7 19:42:38 2007 */
+ 
++#define PY_SSIZE_T_CLEAN
+ #include "Python.h"
+ #include "structmember.h"
+ #ifndef PY_LONG_LONG
+   #define PY_LONG_LONG LONG_LONG
+ #endif
++#if PY_VERSION_HEX < 0x02050000
++  typedef int Py_ssize_t;
++  #define PY_SSIZE_T_MAX INT_MAX
++  #define PY_SSIZE_T_MIN INT_MIN
++  #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
++  #define PyInt_AsSsize_t(o)   PyInt_AsLong(o)
++#endif
++#ifdef __cplusplus
++#define __PYX_EXTERN_C extern "C"
++#else
++#define __PYX_EXTERN_C extern
++#endif
++__PYX_EXTERN_C double pow(double, double);
+ #include "event.h"
+ 
+ 
+ typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/
+ typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/
+-static PyObject *__Pyx_UnpackItem(PyObject *, int); /*proto*/
+-static int __Pyx_EndUnpack(PyObject *, int); /*proto*/
++static PyObject *__Pyx_UnpackItem(PyObject *, Py_ssize_t); /*proto*/
++static int __Pyx_EndUnpack(PyObject *, Py_ssize_t); /*proto*/
+ static int __Pyx_PrintItem(PyObject *); /*proto*/
+ static int __Pyx_PrintNewline(void); /*proto*/
+ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
+@@ -20,7 +34,7 @@
+ static PyObject *__Pyx_GetExcValue(void); /*proto*/
+ static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed, char *name); /*proto*/
+ static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
+-static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], int nargs, PyObject **args2, PyObject **kwds2); /*proto*/
++static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], Py_ssize_t nargs, PyObject **args2, PyObject **kwds2); /*proto*/
+ static void __Pyx_WriteUnraisable(char *name); /*proto*/
+ static void __Pyx_AddTraceback(char *funcname); /*proto*/
+ static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size);  /*proto*/
+@@ -35,13 +49,12 @@
+ static PyObject *__pyx_b;
+ static int __pyx_lineno;
+ static char *__pyx_filename;
+-staticforward char **__pyx_f;
++static char **__pyx_f;
+ 
+ static char __pyx_mdoc[] = "event library\n\nThis module provides a mechanism to execute a function when a\nspecific event on a file handle, file descriptor, or signal occurs,\nor after a given time has passed.\n";
+ 
+ /* Declarations from event */
+ 
+-staticforward PyTypeObject __pyx_type_5event_event;
+ 
+ struct __pyx_obj_5event_event {
+   PyObject_HEAD
+@@ -54,25 +67,21 @@
+   struct timeval tv;
+ };
+ 
+-staticforward PyTypeObject __pyx_type_5event_read;
+ 
+ struct __pyx_obj_5event_read {
+   struct __pyx_obj_5event_event __pyx_base;
+ };
+ 
+-staticforward PyTypeObject __pyx_type_5event_write;
+ 
+ struct __pyx_obj_5event_write {
+   struct __pyx_obj_5event_event __pyx_base;
+ };
+ 
+-staticforward PyTypeObject __pyx_type_5event_signal;
+ 
+ struct __pyx_obj_5event_signal {
+   struct __pyx_obj_5event_event __pyx_base;
+ };
+ 
+-staticforward PyTypeObject __pyx_type_5event_timeout;
+ 
+ struct __pyx_obj_5event_timeout {
+   struct __pyx_obj_5event_event __pyx_base;
+@@ -131,7 +140,7 @@
+ static int __pyx_f_5event___event_sigcb(void) {
+   int __pyx_r;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":66 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":66 */
+   __pyx_r = (-1);
+   goto __pyx_L0;
+ 
+@@ -150,7 +159,7 @@
+   PyObject *__pyx_2 = 0;
+   PyObject *__pyx_3 = 0;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":69 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":69 */
+   __pyx_1 = (PyObject *)__pyx_v_arg;
+   Py_INCREF(__pyx_1);
+   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n___callback); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;}
+@@ -180,7 +189,7 @@
+   PyObject *__pyx_2 = 0;
+   PyObject *__pyx_3 = 0;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":72 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":72 */
+   __pyx_1 = (PyObject *)__pyx_v_arg;
+   Py_INCREF(__pyx_1);
+   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n___simple_callback); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;}
+@@ -233,43 +242,43 @@
+   Py_INCREF(__pyx_v_handle);
+   Py_INCREF(__pyx_v_simple);
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":96 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":96 */
+   Py_INCREF(__pyx_v_callback);
+   Py_DECREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->callback);
+   ((struct __pyx_obj_5event_event *)__pyx_v_self)->callback = __pyx_v_callback;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":97 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":97 */
+   Py_INCREF(__pyx_v_arg);
+   Py_DECREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->args);
+   ((struct __pyx_obj_5event_event *)__pyx_v_self)->args = __pyx_v_arg;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":98 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":98 */
+   __pyx_1 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; goto __pyx_L1;}
+   Py_DECREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->evtype);
+   ((struct __pyx_obj_5event_event *)__pyx_v_self)->evtype = __pyx_1;
+   __pyx_1 = 0;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":99 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":99 */
+   Py_INCREF(__pyx_v_handle);
+   Py_DECREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->handle);
+   ((struct __pyx_obj_5event_event *)__pyx_v_self)->handle = __pyx_v_handle;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":100 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":100 */
+   __pyx_2 = PyObject_IsTrue(__pyx_v_simple); if (__pyx_2 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; goto __pyx_L1;}
+   if (__pyx_2) {
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":101 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":101 */
+     __pyx_v_handler = __pyx_f_5event___simple_event_handler;
+     goto __pyx_L2;
+   }
+   /*else*/ {
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":103 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":103 */
+     __pyx_v_handler = __pyx_f_5event___event_handler;
+   }
+   __pyx_L2:;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":104 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":104 */
+   __pyx_2 = (__pyx_v_evtype == 0);
+   if (__pyx_2) {
+     __pyx_3 = PyObject_IsTrue(__pyx_v_handle); if (__pyx_3 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; goto __pyx_L1;}
+@@ -277,13 +286,13 @@
+   }
+   if (__pyx_2) {
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":105 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":105 */
+     evtimer_set((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_v_handler,((void (*))__pyx_v_self));
+     goto __pyx_L3;
+   }
+   /*else*/ {
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":107 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":107 */
+     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_isinstance); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
+     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
+     __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
+@@ -299,7 +308,7 @@
+     __pyx_2 = (!__pyx_3);
+     if (__pyx_2) {
+ 
+-      /* "/Users/dugsong/projects/pyevent/event.pyx":108 */
++      /* "/home/goodyear/temp/pyevent-0.3/event.pyx":108 */
+       __pyx_1 = PyObject_GetAttr(__pyx_v_handle, __pyx_n_fileno); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; goto __pyx_L1;}
+       __pyx_5 = PyTuple_New(0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; goto __pyx_L1;}
+       __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; goto __pyx_L1;}
+@@ -312,7 +321,7 @@
+     }
+     __pyx_L4:;
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":109 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":109 */
+     __pyx_3 = PyInt_AsLong(__pyx_v_handle); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;}
+     event_set((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_3,__pyx_v_evtype,__pyx_v_handler,((void (*))__pyx_v_self));
+   }
+@@ -340,8 +349,8 @@
+ static PyObject *__pyx_f_5event_5event___simple_callback(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+ static PyObject *__pyx_f_5event_5event___simple_callback(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+   short __pyx_v_evtype;
+-  extern int event_gotsig;
+-  extern int ((*event_sigcb)(void));
++  __PYX_EXTERN_C int event_gotsig;
++  __PYX_EXTERN_C int ((*event_sigcb)(void));
+   PyObject *__pyx_r;
+   PyObject *__pyx_1 = 0;
+   PyObject *__pyx_2 = 0;
+@@ -353,10 +362,10 @@
+   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "h", __pyx_argnames, &__pyx_v_evtype)) return 0;
+   Py_INCREF(__pyx_v_self);
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":115 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":115 */
+   /*try:*/ {
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":116 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":116 */
+     __pyx_1 = PySequence_Tuple(((struct __pyx_obj_5event_event *)__pyx_v_self)->args); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L2;}
+     __pyx_2 = PyObject_CallObject(((struct __pyx_obj_5event_event *)__pyx_v_self)->callback, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L2;}
+     Py_DECREF(__pyx_1); __pyx_1 = 0;
+@@ -365,20 +374,20 @@
+     Py_DECREF(__pyx_2); __pyx_2 = 0;
+     if (__pyx_3) {
+ 
+-      /* "/Users/dugsong/projects/pyevent/event.pyx":117 */
++      /* "/home/goodyear/temp/pyevent-0.3/event.pyx":117 */
+       __pyx_3 = ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_sec;
+       if (!__pyx_3) {
+         __pyx_3 = ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_usec;
+       }
+       if (__pyx_3) {
+ 
+-        /* "/Users/dugsong/projects/pyevent/event.pyx":118 */
++        /* "/home/goodyear/temp/pyevent-0.3/event.pyx":118 */
+         event_add((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),(&((struct __pyx_obj_5event_event *)__pyx_v_self)->tv));
+         goto __pyx_L5;
+       }
+       /*else*/ {
+ 
+-        /* "/Users/dugsong/projects/pyevent/event.pyx":120 */
++        /* "/home/goodyear/temp/pyevent-0.3/event.pyx":120 */
+         event_add((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),0);
+       }
+       __pyx_L5:;
+@@ -391,13 +400,13 @@
+   Py_XDECREF(__pyx_1); __pyx_1 = 0;
+   Py_XDECREF(__pyx_2); __pyx_2 = 0;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":121 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":121 */
+   /*except:*/ {
+     __Pyx_AddTraceback("event.__simple_callback");
+     __pyx_1 = __Pyx_GetExcValue(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
+     Py_DECREF(__pyx_1); __pyx_1 = 0;
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":122 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":122 */
+     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_sys); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
+     __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_exc_info); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
+     Py_DECREF(__pyx_2); __pyx_2 = 0;
+@@ -408,16 +417,16 @@
+     if (PyObject_SetAttr(__pyx_m, __pyx_n___event_exc, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
+     Py_DECREF(__pyx_4); __pyx_4 = 0;
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":123 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":123 */
+     event_sigcb = __pyx_f_5event___event_sigcb;
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":124 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":124 */
+     event_gotsig = 1;
+     goto __pyx_L3;
+   }
+   __pyx_L3:;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":126 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":126 */
+   __pyx_1 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;}
+   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;}
+   __pyx_4 = PyNumber_And(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;}
+@@ -446,13 +455,13 @@
+   }
+   if (__pyx_3) {
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":128 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":128 */
+     Py_DECREF(__pyx_v_self);
+     goto __pyx_L6;
+   }
+   __pyx_L6:;
+ 
+-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
++  __pyx_r = Py_None; Py_INCREF(Py_None);
+   goto __pyx_L0;
+   __pyx_L1:;
+   Py_XDECREF(__pyx_1);
+@@ -468,8 +477,8 @@
+ static PyObject *__pyx_f_5event_5event___callback(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+ static PyObject *__pyx_f_5event_5event___callback(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+   short __pyx_v_evtype;
+-  extern int event_gotsig;
+-  extern int ((*event_sigcb)(void));
++  __PYX_EXTERN_C int event_gotsig;
++  __PYX_EXTERN_C int ((*event_sigcb)(void));
+   PyObject *__pyx_r;
+   PyObject *__pyx_1 = 0;
+   PyObject *__pyx_2 = 0;
+@@ -480,10 +489,10 @@
+   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "h", __pyx_argnames, &__pyx_v_evtype)) return 0;
+   Py_INCREF(__pyx_v_self);
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":134 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":134 */
+   /*try:*/ {
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":135 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":135 */
+     __pyx_1 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; goto __pyx_L2;}
+     __pyx_2 = PyTuple_New(4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; goto __pyx_L2;}
+     Py_INCREF(__pyx_v_self);
+@@ -503,13 +512,13 @@
+   Py_XDECREF(__pyx_2); __pyx_2 = 0;
+   Py_XDECREF(__pyx_1); __pyx_1 = 0;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":136 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":136 */
+   /*except:*/ {
+     __Pyx_AddTraceback("event.__callback");
+     __pyx_2 = __Pyx_GetExcValue(); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; goto __pyx_L1;}
+     Py_DECREF(__pyx_2); __pyx_2 = 0;
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":137 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":137 */
+     __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_sys); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; goto __pyx_L1;}
+     __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_exc_info); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; goto __pyx_L1;}
+     Py_DECREF(__pyx_1); __pyx_1 = 0;
+@@ -520,16 +529,16 @@
+     if (PyObject_SetAttr(__pyx_m, __pyx_n___event_exc, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; goto __pyx_L1;}
+     Py_DECREF(__pyx_3); __pyx_3 = 0;
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":138 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":138 */
+     event_sigcb = __pyx_f_5event___event_sigcb;
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":139 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":139 */
+     event_gotsig = 1;
+     goto __pyx_L3;
+   }
+   __pyx_L3:;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":140 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":140 */
+   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; goto __pyx_L1;}
+   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; goto __pyx_L1;}
+   __pyx_3 = PyNumber_Or(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; goto __pyx_L1;}
+@@ -548,13 +557,13 @@
+   __pyx_5 = (!event_pending((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_4,0));
+   if (__pyx_5) {
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":141 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":141 */
+     Py_DECREF(__pyx_v_self);
+     goto __pyx_L4;
+   }
+   __pyx_L4:;
+ 
+-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
++  __pyx_r = Py_None; Py_INCREF(Py_None);
+   goto __pyx_L0;
+   __pyx_L1:;
+   Py_XDECREF(__pyx_1);
+@@ -582,7 +591,7 @@
+   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|f", __pyx_argnames, &__pyx_v_timeout)) return 0;
+   Py_INCREF(__pyx_v_self);
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":150 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":150 */
+   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;}
+   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;}
+   __pyx_3 = PyNumber_Or(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;}
+@@ -601,41 +610,41 @@
+   __pyx_5 = (!event_pending((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_4,0));
+   if (__pyx_5) {
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":152 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":152 */
+     Py_INCREF(__pyx_v_self);
+     goto __pyx_L2;
+   }
+   __pyx_L2:;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":153 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":153 */
+   ((struct __pyx_obj_5event_event *)__pyx_v_self)->timeout = __pyx_v_timeout;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":154 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":154 */
+   __pyx_5 = (__pyx_v_timeout >= 0.0);
+   if (__pyx_5) {
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":155 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":155 */
+     ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_sec = ((long )__pyx_v_timeout);
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":156 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":156 */
+     ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_usec = ((__pyx_v_timeout - ((float )((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_sec)) * 1000000.0);
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":157 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":157 */
+     event_add((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),(&((struct __pyx_obj_5event_event *)__pyx_v_self)->tv));
+     goto __pyx_L3;
+   }
+   /*else*/ {
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":159 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":159 */
+     ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_sec = 0;
+     ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_usec = 0;
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":160 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":160 */
+     event_add((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),0);
+   }
+   __pyx_L3:;
+ 
+-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
++  __pyx_r = Py_None; Py_INCREF(Py_None);
+   goto __pyx_L0;
+   __pyx_L1:;
+   Py_XDECREF(__pyx_1);
+@@ -660,7 +669,7 @@
+   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
+   Py_INCREF(__pyx_v_self);
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":164 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":164 */
+   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_TIMEOUT); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;}
+   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;}
+   __pyx_3 = PyNumber_Or(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;}
+@@ -681,7 +690,7 @@
+   __pyx_2 = 0;
+   goto __pyx_L0;
+ 
+-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
++  __pyx_r = Py_None; Py_INCREF(Py_None);
+   goto __pyx_L0;
+   __pyx_L1:;
+   Py_XDECREF(__pyx_1);
+@@ -708,7 +717,7 @@
+   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
+   Py_INCREF(__pyx_v_self);
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":168 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":168 */
+   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_pending); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;}
+   __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;}
+   __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;}
+@@ -718,16 +727,16 @@
+   Py_DECREF(__pyx_3); __pyx_3 = 0;
+   if (__pyx_4) {
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":169 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":169 */
+     event_del((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev));
+ 
+-    /* "/Users/dugsong/projects/pyevent/event.pyx":170 */
++    /* "/home/goodyear/temp/pyevent-0.3/event.pyx":170 */
+     Py_DECREF(__pyx_v_self);
+     goto __pyx_L2;
+   }
+   __pyx_L2:;
+ 
+-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
++  __pyx_r = Py_None; Py_INCREF(Py_None);
+   goto __pyx_L0;
+   __pyx_L1:;
+   Py_XDECREF(__pyx_1);
+@@ -749,7 +758,7 @@
+   PyObject *__pyx_3 = 0;
+   Py_INCREF(__pyx_v_self);
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":173 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":173 */
+   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_delete); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;}
+   __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;}
+   __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;}
+@@ -778,7 +787,7 @@
+   PyObject *__pyx_2 = 0;
+   Py_INCREF(__pyx_v_self);
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":176 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":176 */
+   __pyx_1 = PyInt_FromLong(((struct __pyx_obj_5event_event *)__pyx_v_self)->ev.ev_flags); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 177; goto __pyx_L1;}
+   __pyx_2 = PyTuple_New(4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 177; goto __pyx_L1;}
+   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1);
+@@ -795,7 +804,7 @@
+   __pyx_1 = 0;
+   goto __pyx_L0;
+ 
+-  __pyx_r = Py_None; Py_INCREF(__pyx_r);
++  __pyx_r = Py_None; Py_INCREF(Py_None);
+   goto __pyx_L0;
+   __pyx_L1:;
+   Py_XDECREF(__pyx_1);
+@@ -834,11 +843,11 @@
+   Py_INCREF(__pyx_v_handle);
+   Py_INCREF(__pyx_v_callback);
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":193 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":193 */
+   __pyx_1 = PyObject_GetAttr(((PyObject*)__pyx_ptype_5event_event), __pyx_n___init__); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; goto __pyx_L1;}
+   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; goto __pyx_L1;}
+   __pyx_3 = PyTuple_New(5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; goto __pyx_L1;}
+-  Py_INCREF((PyObject *)__pyx_v_self);
++  Py_INCREF(__pyx_v_self);
+   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_self);
+   Py_INCREF(__pyx_v_callback);
+   PyTuple_SET_ITEM(__pyx_3, 1, __pyx_v_callback);
+@@ -858,12 +867,12 @@
+   Py_DECREF(__pyx_2); __pyx_2 = 0;
+   Py_DECREF(__pyx_4); __pyx_4 = 0;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":194 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":194 */
+   Py_INCREF(__pyx_v_args);
+   Py_DECREF(((struct __pyx_obj_5event_read *)__pyx_v_self)->__pyx_base.args);
+   ((struct __pyx_obj_5event_read *)__pyx_v_self)->__pyx_base.args = __pyx_v_args;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":195 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":195 */
+   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_add); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; goto __pyx_L1;}
+   __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; goto __pyx_L1;}
+   __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; goto __pyx_L1;}
+@@ -913,11 +922,11 @@
+   Py_INCREF(__pyx_v_handle);
+   Py_INCREF(__pyx_v_callback);
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":211 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":211 */
+   __pyx_1 = PyObject_GetAttr(((PyObject*)__pyx_ptype_5event_event), __pyx_n___init__); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; goto __pyx_L1;}
+   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; goto __pyx_L1;}
+   __pyx_3 = PyTuple_New(5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; goto __pyx_L1;}
+-  Py_INCREF((PyObject *)__pyx_v_self);
++  Py_INCREF(__pyx_v_self);
+   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_self);
+   Py_INCREF(__pyx_v_callback);
+   PyTuple_SET_ITEM(__pyx_3, 1, __pyx_v_callback);
+@@ -937,12 +946,12 @@
+   Py_DECREF(__pyx_2); __pyx_2 = 0;
+   Py_DECREF(__pyx_4); __pyx_4 = 0;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":212 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":212 */
+   Py_INCREF(__pyx_v_args);
+   Py_DECREF(((struct __pyx_obj_5event_write *)__pyx_v_self)->__pyx_base.args);
+   ((struct __pyx_obj_5event_write *)__pyx_v_self)->__pyx_base.args = __pyx_v_args;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":213 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":213 */
+   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_add); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;}
+   __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;}
+   __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;}
+@@ -992,7 +1001,7 @@
+   Py_INCREF(__pyx_v_sig);
+   Py_INCREF(__pyx_v_callback);
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":230 */
++  /* "/home/goodyear/temp/pyevent-0.3/event.pyx":230 */
+   __pyx_1 = PyObject_GetAttr(((PyObject*)__pyx_ptype_5event_event), __pyx_n___init__); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;}
+   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;}
+   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_EV_PERSIST); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;}
+@@ -1000,7 +1009,7 @@
+   Py_DECREF(__pyx_2); __pyx_2 = 0;
+   Py_DECREF(__pyx_3); __pyx_3 = 0;
+   __pyx_2 = PyTuple_New(5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;}
+-  Py_INCREF((PyObject *)__pyx_v_self);
++  Py_INCREF(__pyx_v_self);
+   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_self);
+   Py_INCREF(__pyx_v_callback);
+   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_v_callback);
+@@ -1020,12 +1029,12 @@
+   Py_DECREF(__pyx_3); __pyx_3 = 0;
+   Py_DECREF(__pyx_4); __pyx_4 = 0;
+ 
+-  /* "/Users/dugsong/projects/pyevent/event.pyx":232 */
<<Diff was trimmed, longer than 597 lines>>


More information about the pld-cvs-commit mailing list