From d8d81d1b049836f7d4fae7b0077a8ce9e2fc43ac Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Mon, 23 Jul 2007 15:59:03 +0100 Subject: [PATCH] Expunge trailing spaces Organization: Straylight/Edgeware From: Mark Wooding --- array.c | 12 ++++++------ array.h | 6 +++--- assoc.pyx | 6 +++--- atom-base.c | 10 +++++----- atom.h | 6 +++--- atom.pyx | 4 ++-- bres.pyx | 4 ++-- codec.pyx.in | 8 ++++---- conn.pyx | 4 ++-- crc32.pyx | 4 ++-- debian/changelog | 2 +- defs.pxi | 44 ++++++++++++++++++++++---------------------- fdutils.pyx | 4 ++-- fwatch.pyx | 16 +++++++++------- grim.h | 6 +++--- ident.pyx | 4 ++-- lbuf.pyx | 4 ++-- mLib.pyx | 4 ++-- mapping.pyx | 8 ++++---- pkbuf.pyx | 4 ++-- report.pyx | 4 ++-- sel-base.pyx | 4 ++-- sel-file.pyx | 4 ++-- sel-timer.pyx | 4 ++-- selbuf.pyx | 4 ++-- selpk.pyx | 4 ++-- setup.py | 12 ++++++------ sig.pyx | 4 ++-- str.pyx | 4 ++-- sym.pyx | 6 +++--- unihash.pyx | 4 ++-- url.pyx | 6 +++--- utils.pyx | 4 ++-- 33 files changed, 113 insertions(+), 111 deletions(-) diff --git a/array.c b/array.c index 6f8048a..768a926 100644 --- a/array.c +++ b/array.c @@ -7,7 +7,7 @@ * (c) 2005 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to mLib. * @@ -15,12 +15,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * mLib/Python is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with mLib/Python; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -218,7 +218,7 @@ static int da_insert(PyObject *me, PyObject *seq, int start, int end) { PyObject **items; size_t n; - + if (0 > start || start > end || end > DA_LEN(DA_V(me))) { PyErr_SetString(PyExc_IndexError, "bad slice"); return (-1); @@ -341,7 +341,7 @@ static PyObject *da_pygetslice(PyObject *me, int i, int j) static int da_pyputitem(PyObject *me, int i, PyObject *x) { PyObject **p; - + if (i < 0 || i >= DA_LEN(DA_V(me))) { PyErr_SetString(PyExc_IndexError, "index out of range"); return (-1); @@ -383,7 +383,7 @@ static PyObject *da_pyrepr(PyObject *me) dstr_puts(&d, "Array(["); for (i = 0; i < DA_LEN(DA_V(me)); i++) { if ((s = PyObject_Repr(DA(DA_V(me))[i])) == 0 || - PyString_AsStringAndSize(s, &p, &n)) { + PyString_AsStringAndSize(s, &p, &n)) { Py_XDECREF(s); goto done; } diff --git a/array.h b/array.h index 96d4f9a..832519a 100644 --- a/array.h +++ b/array.h @@ -7,7 +7,7 @@ * (c) 2005 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to mLib. * @@ -15,12 +15,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * mLib/Python is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with mLib/Python; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/assoc.pyx b/assoc.pyx index 26369de..535fa03 100644 --- a/assoc.pyx +++ b/assoc.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -56,7 +56,7 @@ cdef class AssocTable (Mapping): ee = <_assoc_entry *>e Py_INCREF(ee.v) return ee.v - cdef void _setval(me, void *e, object val): + cdef void _setval(me, void *e, object val): cdef _assoc_entry *ee ee = <_assoc_entry *>e if ee.v: diff --git a/atom-base.c b/atom-base.c index e59fa2b..62a45a6 100644 --- a/atom-base.c +++ b/atom-base.c @@ -7,7 +7,7 @@ * (c) 2005 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to mLib. * @@ -15,12 +15,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * mLib/Python is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with mLib/Python; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -60,7 +60,7 @@ PyObject *atom_pywrap(atom *a) atom_pyobj *ao = PyObject_NEW(atom_pyobj, &atom_pytype); ao->a = a; e->a = (PyObject *)ao; - } + } RETURN_OBJ(e->a); } @@ -82,7 +82,7 @@ PyObject *atom_pyintern(PyObject *x) } static void atom_pydealloc(PyObject *me) - { fprintf(stderr, "ouch! freeing atom\n"); abort(); } + { fprintf(stderr, "ouch! freeing atom\n"); abort(); } static PyObject *atom_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { diff --git a/atom.h b/atom.h index 6bc5bd3..3f1a04f 100644 --- a/atom.h +++ b/atom.h @@ -7,7 +7,7 @@ * (c) 2005 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to mLib. * @@ -15,12 +15,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * mLib/Python is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with mLib/Python; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/atom.pyx b/atom.pyx index fc935f8..5c0cde6 100644 --- a/atom.pyx +++ b/atom.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/bres.pyx b/bres.pyx index 30aac12..0ddfb11 100644 --- a/bres.pyx +++ b/bres.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/codec.pyx.in b/codec.pyx.in index ad60269..e683233 100644 --- a/codec.pyx.in +++ b/codec.pyx.in @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -49,7 +49,7 @@ cdef class %CLASS%Encode: me.ctx.maxline = maxline def __dealloc__(me): if me.ctx.indent: - xfree(me.ctx.indent) + xfree(me.ctx.indent) property indent: def __get__(me): return me.ctx.indent @@ -113,7 +113,7 @@ cdef class %CLASS%Decode: rc = PyString_FromStringAndSize(d.buf, d.len) finally: dstr_destroy(&d) - return rc + return rc def %PREFIX%_decode(text, *arg, **kw): d = %CLASS%Decode(*arg, **kw) diff --git a/conn.pyx b/conn.pyx index e485f5d..04b9ffa 100644 --- a/conn.pyx +++ b/conn.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/crc32.pyx b/crc32.pyx index 77bc863..f76ef5e 100644 --- a/crc32.pyx +++ b/crc32.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/debian/changelog b/debian/changelog index 32301da..9865ad9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,4 +2,4 @@ python-mlib (1.0.0) experimental; urgency=low * Debianization! - -- Mark Wooding Thu, 13 Oct 2005 18:14:18 +0100 + -- Mark Wooding Mon, 23 Jul 2007 16:02:27 +0100 diff --git a/defs.pxi b/defs.pxi index f452b28..a09130c 100644 --- a/defs.pxi +++ b/defs.pxi @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -250,7 +250,7 @@ cdef extern from 'mLib/lbuf.h': void lbuf_enable(lbuf *b) void lbuf_disable(lbuf *b) void lbuf_init(lbuf *b, - void (*func)(char *s, size_t len, void *arg), void *arg) + void (*func)(char *s, size_t len, void *arg), void *arg) void lbuf_destroy(lbuf *b) #----- Packet buffer -------------------------------------------------------- @@ -266,9 +266,9 @@ cdef extern from 'mLib/pkbuf.h': size_t pkbuf_free(pkbuf *pk, unsigned char **p) void pkbuf_want(pkbuf *pk, size_t sz) void pkbuf_init(pkbuf *b, - void (*func)(unsigned char *s, size_t len, - pkbuf *pk, size_t *keep, void *arg), - void *arg) + void (*func)(unsigned char *s, size_t len, + pkbuf *pk, size_t *keep, void *arg), + void *arg) void pkbuf_destroy(pkbuf *b) #----- Select stuff --------------------------------------------------------- @@ -288,14 +288,14 @@ cdef extern from 'mLib/sel.h': _SEL_EXC "SEL_EXC" void sel_init(sel_state *s) void sel_initfile(sel_state *s, sel_file *f, int fd, unsigned mode, - void (*func)(int fd, unsigned mode, void *arg), - void *arg) + void (*func)(int fd, unsigned mode, void *arg), + void *arg) void sel_force(sel_file *f) void sel_addfile(sel_file *f) void sel_rmfile(sel_file *f) void sel_addtimer(sel_state *s, sel_timer *t, timeval *tv, - void (*func)(timeval *tv, void *arg), - void *arg) + void (*func)(timeval *tv, void *arg), + void *arg) void sel_rmtimer(sel_timer *t) int sel_select(sel_state *s) except * @@ -305,7 +305,7 @@ cdef extern from 'mLib/conn.h': ctypedef struct conn: pass int conn_fd(conn *c, sel_state *s, int fd, - void (*func)(int fd, void *arg), void *arg) + void (*func)(int fd, void *arg), void *arg) void conn_kill(conn *c) # --- Background name resolver --- @@ -314,9 +314,9 @@ cdef extern from 'mLib/bres.h': ctypedef struct bres_client: pass void bres_byname(bres_client *r, char *name, - void (*func)(hostent *h, void *arg), void *arg) + void (*func)(hostent *h, void *arg), void *arg) void bres_byaddr(bres_client *r, in_addr addr, - void (*func)(hostent *h, void *arg), void *arg) + void (*func)(hostent *h, void *arg), void *arg) void bres_abort(bres_client *r) void bres_exec(char *null) void bres_init(sel_state *s) @@ -340,7 +340,7 @@ cdef extern from 'mLib/selbuf.h': void selbuf_disable(selbuf *b) void selbuf_setsize(selbuf *b, size_t sz) void selbuf_init(selbuf *b, sel_state *s, int fd, - void (*func)(char *s, size_t len, void *arg), void *arg) + void (*func)(char *s, size_t len, void *arg), void *arg) void selbuf_destroy(selbuf *b) # --- Packet buffer --- @@ -353,9 +353,9 @@ cdef extern from 'mLib/selpk.h': void selpk_disable(selpk *b) void selpk_want(selpk *b, size_t sz) void selpk_init(selpk *b, sel_state *s, int fd, - void (*func)(unsigned char *p, size_t n, - pkbuf *pk, size_t *keep, void *arg), - void *arg) + void (*func)(unsigned char *p, size_t n, + pkbuf *pk, size_t *keep, void *arg), + void *arg) void selpk_destroy(selpk *b) # --- Ident client --- @@ -379,9 +379,9 @@ cdef extern from 'mLib/ident.h': int type ident_u u void ident(ident_request *rq, sel_state *s, - sockaddr_in *local, sockaddr_in *remote, - void (*func)(ident_reply *r, void *arg), - void *arg) + sockaddr_in *local, sockaddr_in *remote, + void (*func)(ident_reply *r, void *arg), + void *arg) void ident_abort(ident_request *rq) #----- Error reporting ------------------------------------------------------ @@ -407,8 +407,8 @@ cdef extern from 'mLib/fwatch.h': cdef extern from 'mLib/fdflags.h': int _fdflags "fdflags"(int fd, - unsigned fbic, unsigned fxor, - unsigned fdbic, unsigned fdxor) + unsigned fbic, unsigned fxor, + unsigned fdbic, unsigned fdxor) cdef extern from 'mLib/fdpass.h': int fdpass_send(int sock, int fd, void *p, size_t sz) diff --git a/fdutils.pyx b/fdutils.pyx index 7923d44..c6ba79e 100644 --- a/fdutils.pyx +++ b/fdutils.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/fwatch.pyx b/fwatch.pyx index a9e4b97..ab0ae25 100644 --- a/fwatch.pyx +++ b/fwatch.pyx @@ -15,23 +15,23 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. cdef class FWatch: cdef fwatch fw - cdef file + cdef public file def __new__(me, file): - _init(me, file) + me._init(file) def __init__(me, file): - _init(me, file) + me._init(file) cdef _init(me, file): if isinstance(file, str): fwatch_init(&me.fw, file) @@ -39,9 +39,11 @@ cdef class FWatch: fwatch_initfd(&me.fw, _getfd(file)) me.file = file def update(me): + cdef int rc if isinstance(me.file, str): - fwatch_update(&me.fw, me.file) + rc = fwatch_update(&me.fw, me.file) else: - fwatch_initfd(&me.fw, _getfd(me.file)) + rc = fwatch_updatefd(&me.fw, _getfd(me.file)) + return rc #----- That's all, folks ---------------------------------------------------- diff --git a/grim.h b/grim.h index 80570a0..75774a5 100644 --- a/grim.h +++ b/grim.h @@ -7,7 +7,7 @@ * (c) 2005 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to mLib. * @@ -15,12 +15,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * mLib/Python is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with mLib/Python; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/ident.pyx b/ident.pyx index d19c3a4..8f143ec 100644 --- a/ident.pyx +++ b/ident.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/lbuf.pyx b/lbuf.pyx index 820cba1..fe9f00e 100644 --- a/lbuf.pyx +++ b/lbuf.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/mLib.pyx b/mLib.pyx index 2a43cbd..2b25fcd 100644 --- a/mLib.pyx +++ b/mLib.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/mapping.pyx b/mapping.pyx index ab637c3..551261e 100644 --- a/mapping.pyx +++ b/mapping.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -134,7 +134,7 @@ cdef class Mapping: break l.append(func(me, e)) return l - + def keys(me): return me._list(_map_key) def values(me): @@ -162,7 +162,7 @@ cdef class Mapping: return MapValueIter(me) def iteritems(me): return MapItemIter(me) - + cdef class MapIterBase: cdef Mapping m cdef object (*func)(Mapping m, void *e) diff --git a/pkbuf.pyx b/pkbuf.pyx index 9626a98..9bad268 100644 --- a/pkbuf.pyx +++ b/pkbuf.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/report.pyx b/report.pyx index cb368f6..f83a193 100644 --- a/report.pyx +++ b/report.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/sel-base.pyx b/sel-base.pyx index e7b4fbe..29cf6c4 100644 --- a/sel-base.pyx +++ b/sel-base.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/sel-file.pyx b/sel-file.pyx index 9135d4a..53af55e 100644 --- a/sel-file.pyx +++ b/sel-file.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/sel-timer.pyx b/sel-timer.pyx index 261ecde..6e00717 100644 --- a/sel-timer.pyx +++ b/sel-timer.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/selbuf.pyx b/selbuf.pyx index 4a5a288..e0586fc 100644 --- a/selbuf.pyx +++ b/selbuf.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/selpk.pyx b/selpk.pyx index fe85a9f..59d500f 100644 --- a/selpk.pyx +++ b/selpk.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/setup.py b/setup.py index de8e515..5408b70 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ def derive(target, src, subs): if needs_update_p(target, [src]): out = file(target + '.new', 'w') for line in file(src): - out.write(rx_subst.sub((lambda m: subs[m.group(1)]), line)) + out.write(rx_subst.sub((lambda m: subs[m.group(1)]), line)) out.close() rename(target + '.new', target) @@ -77,11 +77,11 @@ def mlibext(src): srcs = [src] mlib = Extension('mLib', ['mLib.pyx', 'atom-base.c', 'array.c'], - - ##extra_compile_args = ['-O0'], - include_dirs = uniquify(incdirs), - library_dirs = uniquify(libdirs), - libraries = uniquify(libs)) + + ##extra_compile_args = ['-O0'], + include_dirs = uniquify(incdirs), + library_dirs = uniquify(libdirs), + libraries = uniquify(libs)) setup(name = 'mLib-python', version = '1.0.0', diff --git a/sig.pyx b/sig.pyx index 17237f3..6496016 100644 --- a/sig.pyx +++ b/sig.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/str.pyx b/str.pyx index bbde1b0..a87f12c 100644 --- a/str.pyx +++ b/str.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/sym.pyx b/sym.pyx index 880d636..8de6938 100644 --- a/sym.pyx +++ b/sym.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -54,7 +54,7 @@ cdef class SymTable (Mapping): ee = <_sym_entry *>e Py_INCREF(ee.v) return ee.v - cdef void _setval(me, void *e, object val): + cdef void _setval(me, void *e, object val): cdef _sym_entry *ee ee = <_sym_entry *>e if ee.v: diff --git a/unihash.pyx b/unihash.pyx index b1cb979..565959f 100644 --- a/unihash.pyx +++ b/unihash.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/url.pyx b/url.pyx index 20c51ce..d4ed121 100644 --- a/url.pyx +++ b/url.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -71,7 +71,7 @@ cdef class URLEncode: if val: me.ctx.f = me.ctx.f | URLF_SEMI else: - me.ctx.f = me.ctx.f & ~URLF_SEMI + me.ctx.f = me.ctx.f & ~URLF_SEMI def __del__(me): dstr_destroy(&me.d) diff --git a/utils.pyx b/utils.pyx index 849effe..9183625 100644 --- a/utils.pyx +++ b/utils.pyx @@ -15,12 +15,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # mLib/Python is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with mLib/Python; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- [mdw]