From owner-svn-ports-all@freebsd.org Tue Apr 12 15:04:32 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A358B0DDE8; Tue, 12 Apr 2016 15:04:32 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BFA811046; Tue, 12 Apr 2016 15:04:31 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3CF4V84029102; Tue, 12 Apr 2016 15:04:31 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3CF4UfA029097; Tue, 12 Apr 2016 15:04:30 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201604121504.u3CF4UfA029097@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 12 Apr 2016 15:04:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413122 - in head/devel/py-event: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2016 15:04:32 -0000 Author: mat Date: Tue Apr 12 15:04:30 2016 New Revision: 413122 URL: https://svnweb.freebsd.org/changeset/ports/413122 Log: Unbreak. Regen patches. PR: 208705 Submitted by: tkato432 yahoo com Sponsored by: Absolight Modified: head/devel/py-event/Makefile (contents, props changed) head/devel/py-event/distinfo (contents, props changed) head/devel/py-event/files/patch-event.c (contents, props changed) head/devel/py-event/files/patch-event.pyx (contents, props changed) head/devel/py-event/pkg-descr (contents, props changed) Modified: head/devel/py-event/Makefile ============================================================================== --- head/devel/py-event/Makefile Tue Apr 12 15:01:22 2016 (r413121) +++ head/devel/py-event/Makefile Tue Apr 12 15:04:30 2016 (r413122) @@ -2,24 +2,24 @@ # $FreeBSD$ PORTNAME= event -PORTVERSION= 0.3 +DISTVERSIONPREFIX= PYEVENT_ +DISTVERSION= 0_3 PORTREVISION= 9 CATEGORIES= devel net python -MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= py${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Python bindings for libevent -BROKEN= unfetchable - LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:devel/libevent2 -PROJECTHOST= pyevent +USE_GITHUB= yes +GH_ACCOUNT= jaraco +GH_PROJECT= pyevent + USES= python USE_PYTHON= distutils autoplist Modified: head/devel/py-event/distinfo ============================================================================== --- head/devel/py-event/distinfo Tue Apr 12 15:01:22 2016 (r413121) +++ head/devel/py-event/distinfo Tue Apr 12 15:04:30 2016 (r413122) @@ -1,2 +1,2 @@ -SHA256 (pyevent-0.3.tar.gz) = b37e5de330751732008ede518100eaf22ca068bdda988b03ca0f8b406d0b1eb9 -SIZE (pyevent-0.3.tar.gz) = 16462 +SHA256 (jaraco-pyevent-PYEVENT_0_3_GH0.tar.gz) = 99e26d36cfdcbc7c67668b200f4f4144d02e005a2863b7ab9b71f63fc616725c +SIZE (jaraco-pyevent-PYEVENT_0_3_GH0.tar.gz) = 30393 Modified: head/devel/py-event/files/patch-event.c ============================================================================== --- head/devel/py-event/files/patch-event.c Tue Apr 12 15:01:22 2016 (r413121) +++ head/devel/py-event/files/patch-event.c Tue Apr 12 15:04:30 2016 (r413122) @@ -1,5 +1,5 @@ ---- event.c.orig 2005-09-12 11:16:58.000000000 +0800 -+++ event.c 2009-12-15 11:56:37.000000000 +0800 +--- event.c.orig 2005-09-12 03:44:04 UTC ++++ event.c @@ -1,47 +1,69 @@ -/* Generated by Pyrex 0.9.3 on Sun Sep 11 23:51:17 2005 */ +/* Generated by Pyrex 0.9.8.5 on Tue Dec 15 11:56:37 2009 */ @@ -95,7 +95,7 @@ struct __pyx_obj_5event_event { PyObject_HEAD -@@ -54,115 +76,155 @@ +@@ -54,115 +76,155 @@ struct __pyx_obj_5event_event { struct timeval tv; }; @@ -320,7 +320,7 @@ goto __pyx_L0; __pyx_L1:; -@@ -173,26 +235,19 @@ +@@ -173,26 +235,19 @@ static void __pyx_f_5event___event_handl __pyx_L0:; } @@ -336,14 +336,6 @@ - __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;} -- Py_DECREF(__pyx_1); __pyx_1 = 0; -- __pyx_1 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;} -- __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;} -- PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); -- __pyx_1 = 0; -- __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;} -- Py_DECREF(__pyx_2); __pyx_2 = 0; -- Py_DECREF(__pyx_3); __pyx_3 = 0; + __pyx_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arg), __pyx_n___simple_callback); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;} + __pyx_2 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;} @@ -351,12 +343,19 @@ + __pyx_2 = 0; + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; -+ Py_DECREF(__pyx_3); __pyx_3 = 0; +- __pyx_1 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;} +- __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;} +- PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); +- __pyx_1 = 0; +- __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;} +- Py_DECREF(__pyx_2); __pyx_2 = 0; + Py_DECREF(__pyx_3); __pyx_3 = 0; +- Py_DECREF(__pyx_1); __pyx_1 = 0; + Py_DECREF(__pyx_2); __pyx_2 = 0; goto __pyx_L0; __pyx_L1:; -@@ -203,10 +258,6 @@ +@@ -203,10 +258,6 @@ static void __pyx_f_5event___simple_even __pyx_L0:; } @@ -367,7 +366,7 @@ static int __pyx_f_5event_5event___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static int __pyx_f_5event_5event___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { PyObject *__pyx_v_callback = 0; -@@ -214,18 +265,17 @@ +@@ -214,18 +265,17 @@ static int __pyx_f_5event_5event___init_ short __pyx_v_evtype; PyObject *__pyx_v_handle = 0; PyObject *__pyx_v_simple = 0; @@ -391,7 +390,7 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|OhOO", __pyx_argnames, &__pyx_v_callback, &__pyx_v_arg, &__pyx_v_evtype, &__pyx_v_handle, &__pyx_v_simple)) return -1; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_callback); -@@ -233,78 +283,57 @@ +@@ -233,78 +283,57 @@ static int __pyx_f_5event_5event___init_ Py_INCREF(__pyx_v_handle); Py_INCREF(__pyx_v_simple); @@ -484,7 +483,7 @@ Py_DECREF(__pyx_v_handle); __pyx_v_handle = __pyx_4; __pyx_4 = 0; -@@ -312,9 +341,9 @@ +@@ -312,9 +341,9 @@ static int __pyx_f_5event_5event___init_ } __pyx_L4:; @@ -497,7 +496,7 @@ } __pyx_L3:; -@@ -323,7 +352,6 @@ +@@ -323,7 +352,6 @@ static int __pyx_f_5event_5event___init_ __pyx_L1:; Py_XDECREF(__pyx_1); Py_XDECREF(__pyx_4); @@ -505,7 +504,7 @@ __Pyx_AddTraceback("event.event.__init__"); __pyx_r = -1; __pyx_L0:; -@@ -335,51 +363,41 @@ +@@ -335,51 +363,41 @@ static int __pyx_f_5event_5event___init_ return __pyx_r; } @@ -566,7 +565,7 @@ } __pyx_L5:; goto __pyx_L4; -@@ -391,73 +409,65 @@ +@@ -391,73 +409,65 @@ static PyObject *__pyx_f_5event_5event__ Py_XDECREF(__pyx_1); __pyx_1 = 0; Py_XDECREF(__pyx_2); __pyx_2 = 0; @@ -671,7 +670,7 @@ __Pyx_AddTraceback("event.event.__simple_callback"); __pyx_r = 0; __pyx_L0:; -@@ -468,24 +478,22 @@ +@@ -468,24 +478,22 @@ static PyObject *__pyx_f_5event_5event__ 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; @@ -703,7 +702,7 @@ Py_INCREF(__pyx_v_self); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_self); Py_INCREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->handle); -@@ -494,7 +502,7 @@ +@@ -494,7 +502,7 @@ static PyObject *__pyx_f_5event_5event__ Py_INCREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->args); PyTuple_SET_ITEM(__pyx_2, 3, ((struct __pyx_obj_5event_event *)__pyx_v_self)->args); __pyx_1 = 0; @@ -712,7 +711,7 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; } -@@ -503,63 +511,55 @@ +@@ -503,63 +511,55 @@ static PyObject *__pyx_f_5event_5event__ Py_XDECREF(__pyx_2); __pyx_2 = 0; Py_XDECREF(__pyx_1); __pyx_1 = 0; @@ -803,7 +802,7 @@ __Pyx_AddTraceback("event.event.__callback"); __pyx_r = 0; __pyx_L0:; -@@ -578,64 +578,62 @@ +@@ -578,64 +578,62 @@ static PyObject *__pyx_f_5event_5event_a short __pyx_4; int __pyx_5; static char *__pyx_argnames[] = {"timeout",0}; @@ -890,7 +889,7 @@ goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); -@@ -659,29 +657,27 @@ +@@ -659,29 +657,27 @@ static PyObject *__pyx_f_5event_5event_p static char *__pyx_argnames[] = {0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; Py_INCREF(__pyx_v_self); @@ -930,7 +929,7 @@ goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); -@@ -694,45 +690,37 @@ +@@ -694,45 +690,37 @@ static PyObject *__pyx_f_5event_5event_p return __pyx_r; } @@ -984,7 +983,7 @@ __Pyx_AddTraceback("event.event.delete"); __pyx_r = 0; __pyx_L0:; -@@ -740,47 +728,33 @@ +@@ -740,47 +728,33 @@ static PyObject *__pyx_f_5event_5event_d return __pyx_r; } @@ -1036,7 +1035,7 @@ PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1); Py_INCREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->handle); PyTuple_SET_ITEM(__pyx_2, 1, ((struct __pyx_obj_5event_event *)__pyx_v_self)->handle); -@@ -789,13 +763,13 @@ +@@ -789,13 +763,13 @@ static PyObject *__pyx_f_5event_5event__ Py_INCREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->args); PyTuple_SET_ITEM(__pyx_2, 3, ((struct __pyx_obj_5event_event *)__pyx_v_self)->args); __pyx_1 = 0; @@ -1052,7 +1051,7 @@ goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); -@@ -807,11 +781,6 @@ +@@ -807,11 +781,6 @@ static PyObject *__pyx_f_5event_5event__ return __pyx_r; } @@ -1064,7 +1063,7 @@ static int __pyx_f_5event_4read___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static int __pyx_f_5event_4read___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { PyObject *__pyx_v_handle = 0; -@@ -823,7 +792,7 @@ +@@ -823,7 +792,7 @@ static int __pyx_f_5event_4read___init__ PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; static char *__pyx_argnames[] = {"handle","callback",0}; @@ -1073,7 +1072,7 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO", __pyx_argnames, &__pyx_v_handle, &__pyx_v_callback)) { Py_XDECREF(__pyx_args); Py_XDECREF(__pyx_kwds); -@@ -834,11 +803,11 @@ +@@ -834,11 +803,11 @@ static int __pyx_f_5event_4read___init__ Py_INCREF(__pyx_v_handle); Py_INCREF(__pyx_v_callback); @@ -1090,7 +1089,7 @@ PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_self); Py_INCREF(__pyx_v_callback); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_v_callback); -@@ -848,28 +817,26 @@ +@@ -848,28 +817,26 @@ static int __pyx_f_5event_4read___init__ Py_INCREF(__pyx_v_handle); PyTuple_SET_ITEM(__pyx_3, 4, __pyx_v_handle); __pyx_2 = 0; @@ -1127,7 +1126,7 @@ __pyx_r = 0; goto __pyx_L0; -@@ -890,7 +857,6 @@ +@@ -890,7 +857,6 @@ static int __pyx_f_5event_4read___init__ return __pyx_r; } @@ -1135,7 +1134,7 @@ static int __pyx_f_5event_5write___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static int __pyx_f_5event_5write___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { PyObject *__pyx_v_handle = 0; -@@ -902,7 +868,7 @@ +@@ -902,7 +868,7 @@ static int __pyx_f_5event_5write___init_ PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; static char *__pyx_argnames[] = {"handle","callback",0}; @@ -1144,7 +1143,7 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO", __pyx_argnames, &__pyx_v_handle, &__pyx_v_callback)) { Py_XDECREF(__pyx_args); Py_XDECREF(__pyx_kwds); -@@ -913,11 +879,11 @@ +@@ -913,11 +879,11 @@ static int __pyx_f_5event_5write___init_ Py_INCREF(__pyx_v_handle); Py_INCREF(__pyx_v_callback); @@ -1161,7 +1160,7 @@ PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_self); Py_INCREF(__pyx_v_callback); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_v_callback); -@@ -927,28 +893,26 @@ +@@ -927,28 +893,26 @@ static int __pyx_f_5event_5write___init_ Py_INCREF(__pyx_v_handle); PyTuple_SET_ITEM(__pyx_3, 4, __pyx_v_handle); __pyx_2 = 0; @@ -1198,7 +1197,7 @@ __pyx_r = 0; goto __pyx_L0; -@@ -969,7 +933,6 @@ +@@ -969,7 +933,6 @@ static int __pyx_f_5event_5write___init_ return __pyx_r; } @@ -1206,7 +1205,7 @@ static int __pyx_f_5event_6signal___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static int __pyx_f_5event_6signal___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { PyObject *__pyx_v_sig = 0; -@@ -981,7 +944,7 @@ +@@ -981,7 +944,7 @@ static int __pyx_f_5event_6signal___init PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; static char *__pyx_argnames[] = {"sig","callback",0}; @@ -1215,7 +1214,7 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO", __pyx_argnames, &__pyx_v_sig, &__pyx_v_callback)) { Py_XDECREF(__pyx_args); Py_XDECREF(__pyx_kwds); -@@ -992,15 +955,15 @@ +@@ -992,15 +955,15 @@ static int __pyx_f_5event_6signal___init Py_INCREF(__pyx_v_sig); Py_INCREF(__pyx_v_callback); @@ -1238,7 +1237,7 @@ PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_self); Py_INCREF(__pyx_v_callback); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_v_callback); -@@ -1010,28 +973,26 @@ +@@ -1010,28 +973,26 @@ static int __pyx_f_5event_6signal___init Py_INCREF(__pyx_v_sig); PyTuple_SET_ITEM(__pyx_2, 4, __pyx_v_sig); __pyx_4 = 0; @@ -1275,7 +1274,7 @@ __pyx_r = 0; goto __pyx_L0; -@@ -1052,7 +1013,6 @@ +@@ -1052,7 +1013,6 @@ static int __pyx_f_5event_6signal___init return __pyx_r; } @@ -1283,7 +1282,7 @@ static int __pyx_f_5event_7timeout___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static int __pyx_f_5event_7timeout___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { PyObject *__pyx_v_secs = 0; -@@ -1064,7 +1024,7 @@ +@@ -1064,7 +1024,7 @@ static int __pyx_f_5event_7timeout___ini PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; static char *__pyx_argnames[] = {"secs","callback",0}; @@ -1292,7 +1291,7 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO", __pyx_argnames, &__pyx_v_secs, &__pyx_v_callback)) { Py_XDECREF(__pyx_args); Py_XDECREF(__pyx_kwds); -@@ -1075,36 +1035,36 @@ +@@ -1075,36 +1035,36 @@ static int __pyx_f_5event_7timeout___ini Py_INCREF(__pyx_v_secs); Py_INCREF(__pyx_v_callback); @@ -1342,7 +1341,7 @@ Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; -@@ -1134,16 +1094,9 @@ +@@ -1134,16 +1094,9 @@ static PyObject *__pyx_f_5event_init(PyO PyObject *__pyx_r; static char *__pyx_argnames[] = {0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; @@ -1360,7 +1359,7 @@ return __pyx_r; } -@@ -1156,52 +1109,42 @@ +@@ -1156,52 +1109,42 @@ static PyObject *__pyx_f_5event_dispatch PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; PyObject *__pyx_5 = 0; @@ -1426,7 +1425,7 @@ __Pyx_AddTraceback("event.dispatch"); __pyx_r = 0; __pyx_L0:; -@@ -1216,27 +1159,25 @@ +@@ -1216,27 +1159,25 @@ static PyObject *__pyx_f_5event_loop(PyO PyObject *__pyx_r; int __pyx_1; static char *__pyx_argnames[] = {"nonblock",0}; @@ -1460,7 +1459,7 @@ goto __pyx_L0; __pyx_L1:; __Pyx_AddTraceback("event.loop"); -@@ -1249,78 +1190,23 @@ +@@ -1249,78 +1190,23 @@ static PyObject *__pyx_f_5event_loop(PyO static PyObject *__pyx_f_5event_abort(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_5event_abort[] = "Abort event dispatch loop."; static PyObject *__pyx_f_5event_abort(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { @@ -1547,7 +1546,7 @@ return o; } -@@ -1362,14 +1248,19 @@ +@@ -1362,14 +1248,19 @@ static int __pyx_tp_traverse_5event_even static int __pyx_tp_clear_5event_event(PyObject *o) { struct __pyx_obj_5event_event *p = (struct __pyx_obj_5event_event *)o; @@ -1575,7 +1574,7 @@ return 0; } -@@ -1421,6 +1312,9 @@ +@@ -1421,6 +1312,9 @@ static PyNumberMethods __pyx_tp_as_numbe 0, /*nb_true_divide*/ 0, /*nb_inplace_floor_divide*/ 0, /*nb_inplace_true_divide*/ @@ -1585,7 +1584,7 @@ }; static PySequenceMethods __pyx_tp_as_sequence_event = { -@@ -1449,7 +1343,7 @@ +@@ -1449,7 +1343,7 @@ static PyBufferProcs __pyx_tp_as_buffer_ 0, /*bf_getcharbuffer*/ }; @@ -1594,7 +1593,7 @@ PyObject_HEAD_INIT(0) 0, /*ob_size*/ "event.event", /*tp_name*/ -@@ -1500,28 +1394,14 @@ +@@ -1500,28 +1394,14 @@ statichere PyTypeObject __pyx_type_5even static PyObject *__pyx_tp_new_5event_read(PyTypeObject *t, PyObject *a, PyObject *k) { PyObject *o = __pyx_ptype_5event_event->tp_new(t, a, k); @@ -1624,7 +1623,7 @@ static struct PyMethodDef __pyx_methods_5event_read[] = { {0, 0, 0, 0} }; -@@ -1565,6 +1445,9 @@ +@@ -1565,6 +1445,9 @@ static PyNumberMethods __pyx_tp_as_numbe 0, /*nb_true_divide*/ 0, /*nb_inplace_floor_divide*/ 0, /*nb_inplace_true_divide*/ @@ -1634,7 +1633,7 @@ }; static PySequenceMethods __pyx_tp_as_sequence_read = { -@@ -1593,7 +1476,7 @@ +@@ -1593,7 +1476,7 @@ static PyBufferProcs __pyx_tp_as_buffer_ 0, /*bf_getcharbuffer*/ }; @@ -1643,7 +1642,7 @@ PyObject_HEAD_INIT(0) 0, /*ob_size*/ "event.read", /*tp_name*/ -@@ -1616,8 +1499,8 @@ +@@ -1616,8 +1499,8 @@ statichere PyTypeObject __pyx_type_5even &__pyx_tp_as_buffer_read, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE, /*tp_flags*/ "read(handle, callback, *args) -> event object\n \n Simplified event interface:\n Create a new read event, and add it to the event queue.\n \n Arguments:\n\n handle -- file handle, descriptor, or socket\n callback -- user callback with (*args) prototype, which can return\n a non-None value to be rescheduled\n *args -- optional callback arguments\n ", /*tp_doc*/ @@ -1654,7 +1653,7 @@ 0, /*tp_richcompare*/ 0, /*tp_weaklistoffset*/ 0, /*tp_iter*/ -@@ -1644,28 +1527,14 @@ +@@ -1644,28 +1527,14 @@ statichere PyTypeObject __pyx_type_5even static PyObject *__pyx_tp_new_5event_write(PyTypeObject *t, PyObject *a, PyObject *k) { PyObject *o = __pyx_ptype_5event_event->tp_new(t, a, k); @@ -1684,7 +1683,7 @@ static struct PyMethodDef __pyx_methods_5event_write[] = { {0, 0, 0, 0} }; -@@ -1709,6 +1578,9 @@ +@@ -1709,6 +1578,9 @@ static PyNumberMethods __pyx_tp_as_numbe 0, /*nb_true_divide*/ 0, /*nb_inplace_floor_divide*/ 0, /*nb_inplace_true_divide*/ @@ -1694,7 +1693,7 @@ }; static PySequenceMethods __pyx_tp_as_sequence_write = { -@@ -1737,7 +1609,7 @@ +@@ -1737,7 +1609,7 @@ static PyBufferProcs __pyx_tp_as_buffer_ 0, /*bf_getcharbuffer*/ }; @@ -1703,7 +1702,7 @@ PyObject_HEAD_INIT(0) 0, /*ob_size*/ "event.write", /*tp_name*/ -@@ -1760,8 +1632,8 @@ +@@ -1760,8 +1632,8 @@ statichere PyTypeObject __pyx_type_5even &__pyx_tp_as_buffer_write, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE, /*tp_flags*/ "write(handle, callback, *args) -> event object\n\n Simplified event interface:\n Create a new write event, and add it to the event queue.\n \n Arguments:\n\n handle -- file handle, descriptor, or socket\n callback -- user callback with (*args) prototype, which can return\n a non-None value to be rescheduled\n *args -- optional callback arguments\n ", /*tp_doc*/ @@ -1714,7 +1713,7 @@ 0, /*tp_richcompare*/ 0, /*tp_weaklistoffset*/ 0, /*tp_iter*/ -@@ -1788,28 +1660,14 @@ +@@ -1788,28 +1660,14 @@ statichere PyTypeObject __pyx_type_5even static PyObject *__pyx_tp_new_5event_signal(PyTypeObject *t, PyObject *a, PyObject *k) { PyObject *o = __pyx_ptype_5event_event->tp_new(t, a, k); @@ -1744,7 +1743,7 @@ static struct PyMethodDef __pyx_methods_5event_signal[] = { {0, 0, 0, 0} }; -@@ -1853,6 +1711,9 @@ +@@ -1853,6 +1711,9 @@ static PyNumberMethods __pyx_tp_as_numbe 0, /*nb_true_divide*/ 0, /*nb_inplace_floor_divide*/ 0, /*nb_inplace_true_divide*/ @@ -1754,7 +1753,7 @@ }; static PySequenceMethods __pyx_tp_as_sequence_signal = { -@@ -1881,7 +1742,7 @@ +@@ -1881,7 +1742,7 @@ static PyBufferProcs __pyx_tp_as_buffer_ 0, /*bf_getcharbuffer*/ }; @@ -1763,7 +1762,7 @@ PyObject_HEAD_INIT(0) 0, /*ob_size*/ "event.signal", /*tp_name*/ -@@ -1904,8 +1765,8 @@ +@@ -1904,8 +1765,8 @@ statichere PyTypeObject __pyx_type_5even &__pyx_tp_as_buffer_signal, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE, /*tp_flags*/ "signal(sig, callback, *args) -> event object\n\n Simplified event interface:\n Create a new signal event, and add it to the event queue.\n XXX - persistent event is added with EV_PERSIST, like signal_set()\n \n Arguments:\n\n sig -- signal number\n callback -- user callback with (*args) prototype, which can return\n a non-None value to be rescheduled\n *args -- optional callback arguments\n ", /*tp_doc*/ @@ -1774,7 +1773,7 @@ 0, /*tp_richcompare*/ 0, /*tp_weaklistoffset*/ 0, /*tp_iter*/ -@@ -1932,28 +1793,14 @@ +@@ -1932,28 +1793,14 @@ statichere PyTypeObject __pyx_type_5even static PyObject *__pyx_tp_new_5event_timeout(PyTypeObject *t, PyObject *a, PyObject *k) { PyObject *o = __pyx_ptype_5event_event->tp_new(t, a, k); @@ -1804,7 +1803,7 @@ static struct PyMethodDef __pyx_methods_5event_timeout[] = { {0, 0, 0, 0} }; -@@ -1997,6 +1844,9 @@ +@@ -1997,6 +1844,9 @@ static PyNumberMethods __pyx_tp_as_numbe 0, /*nb_true_divide*/ 0, /*nb_inplace_floor_divide*/ 0, /*nb_inplace_true_divide*/ @@ -1814,7 +1813,7 @@ }; static PySequenceMethods __pyx_tp_as_sequence_timeout = { -@@ -2025,7 +1875,7 @@ +@@ -2025,7 +1875,7 @@ static PyBufferProcs __pyx_tp_as_buffer_ 0, /*bf_getcharbuffer*/ }; @@ -1823,7 +1822,7 @@ PyObject_HEAD_INIT(0) 0, /*ob_size*/ "event.timeout", /*tp_name*/ -@@ -2048,8 +1898,8 @@ +@@ -2048,8 +1898,8 @@ statichere PyTypeObject __pyx_type_5even &__pyx_tp_as_buffer_timeout, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE, /*tp_flags*/ "timeout(secs, callback, *args) -> event object\n\n Simplified event interface:\n Create a new timer event, and add it to the event queue.\n\n Arguments:\n\n secs -- event timeout in seconds\n callback -- user callback with (*args) prototype, which can return\n a non-None value to be rescheduled\n *args -- optional callback arguments\n ", /*tp_doc*/ @@ -1834,7 +1833,7 @@ 0, /*tp_richcompare*/ 0, /*tp_weaklistoffset*/ 0, /*tp_iter*/ -@@ -2082,155 +1932,199 @@ +@@ -2082,155 +1932,199 @@ static struct PyMethodDef __pyx_methods[ {0, 0, 0, 0} }; @@ -2004,15 +2003,14 @@ - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_False); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 264; goto __pyx_L1;} - __pyx_k14 = __pyx_3; - __pyx_3 = 0; -- ++ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":253 */ ++ Py_INCREF(Py_False); ++ __pyx_d6 = Py_False; + - /* "/Users/dugsong/projects/pyevent/event.pyx":280 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_init); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; goto __pyx_L1;} - __pyx_5 = PyTuple_New(0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; goto __pyx_L1;} - __pyx_6 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":253 */ -+ Py_INCREF(Py_False); -+ __pyx_d6 = Py_False; -+ + /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":265 */ + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_init); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;} @@ -2101,7 +2099,7 @@ if (args2) *args2 = 0; -@@ -2241,25 +2135,37 @@ +@@ -2241,25 +2135,37 @@ static int __Pyx_GetStarArgs( args1 = PyTuple_GetSlice(*args, 0, nargs); if (!args1) goto bad; @@ -2143,7 +2141,7 @@ x = PyDict_GetItemString(*kwds, *p); if (x) { if (PyDict_SetItemString(kwds1, *p, x) < 0) -@@ -2267,6 +2173,8 @@ +@@ -2267,6 +2173,8 @@ static int __Pyx_GetStarArgs( if (PyDict_DelItemString(*kwds2, *p) < 0) goto bad; } @@ -2152,7 +2150,7 @@ } } else { -@@ -2278,101 +2186,43 @@ +@@ -2278,101 +2186,43 @@ static int __Pyx_GetStarArgs( else { kwds1 = *kwds; Py_XINCREF(kwds1); @@ -2204,12 +2202,7 @@ - if (!empty_list) - goto bad; - list = empty_list; -+ PyObject *j = PyInt_FromLong(i); -+ if (!j) -+ return 0; -+ r = PyObject_GetItem(o, j); -+ Py_DECREF(j); - } +- } - global_dict = PyModule_GetDict(__pyx_m); - if (!global_dict) - goto bad; @@ -2255,7 +2248,12 @@ - if (!value) { - value = Py_None; - Py_INCREF(value); -- } ++ PyObject *j = PyInt_FromLong(i); ++ if (!j) ++ return 0; ++ r = PyObject_GetItem(o, j); ++ Py_DECREF(j); + } - Py_XDECREF(tstate->exc_type); - Py_XDECREF(tstate->exc_value); - Py_XDECREF(tstate->exc_traceback); @@ -2276,7 +2274,7 @@ } static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) { -@@ -2394,39 +2244,40 @@ +@@ -2394,39 +2244,40 @@ static void __Pyx_Raise(PyObject *type, value = Py_None; Py_INCREF(value); } @@ -2344,7 +2342,7 @@ } PyErr_Restore(type, value, tb); return; -@@ -2437,24 +2288,49 @@ +@@ -2437,24 +2288,49 @@ raise_error: return; } Modified: head/devel/py-event/files/patch-event.pyx ============================================================================== --- head/devel/py-event/files/patch-event.pyx Tue Apr 12 15:01:22 2016 (r413121) +++ head/devel/py-event/files/patch-event.pyx Tue Apr 12 15:04:30 2016 (r413122) @@ -1,6 +1,6 @@ ---- event.pyx.orig 2005-09-12 11:16:15.000000000 +0800 -+++ event.pyx 2009-12-15 11:56:36.000000000 +0800 -@@ -62,9 +62,6 @@ +--- event.pyx.orig 2005-09-12 03:44:04 UTC ++++ event.pyx +@@ -62,9 +62,6 @@ EV_PERSIST = 0x10 __event_exc = None @@ -10,7 +10,7 @@ cdef void __event_handler(int fd, short evtype, void *arg): (arg).__callback(evtype) -@@ -109,8 +106,6 @@ +@@ -109,8 +106,6 @@ cdef class event: event_set(&self.ev, handle, evtype, handler, self) def __simple_callback(self, short evtype): @@ -19,7 +19,7 @@ global __event_exc try: if self.callback(*self.args) != None: -@@ -120,23 +115,17 @@ +@@ -120,23 +115,17 @@ cdef class event: event_add(&self.ev, NULL) except: __event_exc = sys.exc_info() @@ -43,7 +43,7 @@ if not event_pending(&self.ev, EV_READ|EV_WRITE|EV_SIGNAL|EV_TIMEOUT, NULL): Py_DECREF(self) -@@ -153,7 +142,7 @@ +@@ -153,7 +142,7 @@ cdef class event: self.timeout = timeout if timeout >= 0.0: self.tv.tv_sec = timeout @@ -52,7 +52,7 @@ event_add(&self.ev, &self.tv) else: self.tv.tv_sec = self.tv.tv_usec = 0 -@@ -271,10 +260,6 @@ +@@ -271,10 +260,6 @@ def loop(nonblock=False): def abort(): """Abort event dispatch loop.""" Modified: head/devel/py-event/pkg-descr ============================================================================== --- head/devel/py-event/pkg-descr Tue Apr 12 15:01:22 2016 (r413121) +++ head/devel/py-event/pkg-descr Tue Apr 12 15:04:30 2016 (r413122) @@ -1,3 +1,3 @@ Python Bindings for libevent -WWW: http://code.google.com/p/pyevent/ +WWW: https://github.com/jaraco/pyevent