adapt some line endings to standard Unix style

61cf6216 · Stefan Behnel · 25de842f · 61cf6216 · 61cf6216 · 61cf6216
Commit 61cf6216 authored Jun 12, 2016 by Stefan Behnel
6 changed files
--- a/Demos/callback/README.txt
+++ b/Demos/callback/README.txt
-This example demonstrates how you can wrap a C API
that has a callback interface, so that you can
pass Python functions to it as callbacks.

The files cheesefinder.h and cheesefinder.c
represent the C library to be wrapped.

The file cheese.pyx is the Pyrex module
which wraps it.

The file run_cheese.py demonstrates how to
call the wrapper.
\ No newline at end of file
+This example demonstrates how you can wrap a C API
+that has a callback interface, so that you can
+pass Python functions to it as callbacks.
+
+The files cheesefinder.h and cheesefinder.c
+represent the C library to be wrapped.
+
+The file cheese.pyx is the Pyrex module
+which wraps it.
+
+The file run_cheese.py demonstrates how to
+call the wrapper.
--- a/Demos/callback/cheesefinder.h
+++ b/Demos/callback/cheesefinder.h
-typedef void (*cheesefunc)(char *name, void *user_data);void find_cheeses(cheesefunc user_func, void *user_data);
\ No newline at end of file
+typedef void (*cheesefunc)(char *name, void *user_data);
+void find_cheeses(cheesefunc user_func, void *user_data);
--- a/Doc/About.html
+++ b/Doc/About.html
--- a/Doc/index.html
+++ b/Doc/index.html
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en"><html><head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta name="GENERATOR" content="Mozilla/4.51 (Macintosh; I; PPC) [Netscape]">
   <title>Cython - Front Page</title></head><body>&nbsp;<table CELLSPACING=0 CELLPADDING=10 WIDTH="500" ><tr><td VALIGN=TOP BGCOLOR="#FF9218"><font face="Arial,Helvetica"><font size=+4>Cython</font></font></td>
<td ALIGN=RIGHT VALIGN=TOP WIDTH="200" BGCOLOR="#5DBACA"><font face="Arial,Helvetica"><font size=+1>A
smooth blend of the finest Python&nbsp;</font></font><br><font face="Arial,Helvetica"><font size=+1>with the unsurpassed power&nbsp;</font></font><br><font face="Arial,Helvetica"><font size=+1>of raw C.</font></font></td></tr></table>
<blockquote><font size=+1>Welcome to Cython, a language for writing Python
extension modules. Cython makes creating an extension module is almost as
easy as creating a Python module! To find out more, consult one of the
edifying documents below.</font></blockquote>
<h1><font face="Arial,Helvetica"><font size=+2>Documentation</font></font></h1>
<blockquote><h2><font face="Arial,Helvetica"><font size=+1><a href="About.html">About Cython</a></font></font></h2>
<blockquote><font size=+1>Read this to find out what Cython is all about
and what it can do for you.</font></blockquote>
<h2><font face="Arial,Helvetica"><font size=+1><a href="overview.html">Language
Overview</a></font></font></h2>
<blockquote><font size=+1>A description of all the features of the Cython
language. This is the closest thing to a reference manual in existence
yet.</font></blockquote>
<h2><font face="Arial,Helvetica"><font size=+1><a href="FAQ.html">FAQ</a></font></font></h2>
<blockquote><font size=+1>Want to know how to do something in Cython? Check
here first<font face="Arial,Helvetica">.</font></font></blockquote></blockquote>
<h1><font face="Arial,Helvetica"><font size=+2>Other Resources</font></font></h1>
<blockquote><h2><font face="Arial,Helvetica"><font size=+1><a href="http://www.cosc.canterbury.ac.nz/~greg/python/Cython/mpj17-pyrex-guide/">Michael's
Quick Guide to Cython</a></font></font></h2>
<blockquote><font size=+1>This tutorial-style presentation will take you
through the steps of creating some Cython modules to wrap existing C libraries.
Contributed by <a href="mailto:mpj17@cosc.canterbury.ac.nz">Michael JasonSmith</a>.</font></blockquote>
<h2><font face="Arial,Helvetica"><font size=+1><a href="mailto:greg@cosc.canterbury.ac.nz">Mail
to the Author</a></font></font></h2>
<blockquote><font size=+1>If you have a question that's not answered by
anything here, you're not sure about something, or you have a bug to report
or a suggestion to make, or anything at all to say about Cython, feel free
to email me:<font face="Arial,Helvetica"> </font><tt><a href="mailto:greg@cosc.canterbury.ac.nz">greg@cosc.canterbury.ac.nz</a></tt></font></blockquote></blockquote>
</body></html>
\ No newline at end of file
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="GENERATOR" content="Mozilla/4.51 (Macintosh; I; PPC) [Netscape]">
+   <title>Cython - Front Page</title>
+</head>
+<body>
+&nbsp;
+<table CELLSPACING=0 CELLPADDING=10 WIDTH="500" >
+<tr>
+<td VALIGN=TOP BGCOLOR="#FF9218"><font face="Arial,Helvetica"><font size=+4>Cython</font></font></td>
+
+<td ALIGN=RIGHT VALIGN=TOP WIDTH="200" BGCOLOR="#5DBACA"><font face="Arial,Helvetica"><font size=+1>A
+smooth blend of the finest Python&nbsp;</font></font>
+<br><font face="Arial,Helvetica"><font size=+1>with the unsurpassed power&nbsp;</font></font>
+<br><font face="Arial,Helvetica"><font size=+1>of raw C.</font></font></td>
+</tr>
+</table>
+
+<blockquote><font size=+1>Welcome to Cython, a language for writing Python
+extension modules. Cython makes creating an extension module is almost as
+easy as creating a Python module! To find out more, consult one of the
+edifying documents below.</font></blockquote>
+
+<h1>
+<font face="Arial,Helvetica"><font size=+2>Documentation</font></font></h1>
+
+<blockquote>
+<h2>
+<font face="Arial,Helvetica"><font size=+1><a href="About.html">About Cython</a></font></font></h2>
+
+<blockquote><font size=+1>Read this to find out what Cython is all about
+and what it can do for you.</font></blockquote>
+
+<h2>
+<font face="Arial,Helvetica"><font size=+1><a href="overview.html">Language
+Overview</a></font></font></h2>
+
+<blockquote><font size=+1>A description of all the features of the Cython
+language. This is the closest thing to a reference manual in existence
+yet.</font></blockquote>
+
+<h2>
+<font face="Arial,Helvetica"><font size=+1><a href="FAQ.html">FAQ</a></font></font></h2>
+
+<blockquote><font size=+1>Want to know how to do something in Cython? Check
+here first<font face="Arial,Helvetica">.</font></font></blockquote>
+</blockquote>
+
+<h1>
+<font face="Arial,Helvetica"><font size=+2>Other Resources</font></font></h1>
+
+<blockquote>
+<h2>
+<font face="Arial,Helvetica"><font size=+1><a href="http://www.cosc.canterbury.ac.nz/~greg/python/Cython/mpj17-pyrex-guide/">Michael's
+Quick Guide to Cython</a></font></font></h2>
+
+<blockquote><font size=+1>This tutorial-style presentation will take you
+through the steps of creating some Cython modules to wrap existing C libraries.
+Contributed by <a href="mailto:mpj17@cosc.canterbury.ac.nz">Michael JasonSmith</a>.</font></blockquote>
+
+<h2>
+<font face="Arial,Helvetica"><font size=+1><a href="mailto:greg@cosc.canterbury.ac.nz">Mail
+to the Author</a></font></font></h2>
+
+<blockquote><font size=+1>If you have a question that's not answered by
+anything here, you're not sure about something, or you have a bug to report
+or a suggestion to make, or anything at all to say about Cython, feel free
+to email me:<font face="Arial,Helvetica"> </font><tt><a href="mailto:greg@cosc.canterbury.ac.nz">greg@cosc.canterbury.ac.nz</a></tt></font></blockquote>
+</blockquote>
+
+</body>
+</html>
--- a/Doc/primes.c
+++ b/Doc/primes.c
-#include "Python.h"


static PyObject *__Pyx_UnpackItem(PyObject *, int);
static int __Pyx_EndUnpack(PyObject *, int);
static int __Pyx_PrintItem(PyObject *);
static int __Pyx_PrintNewline(void);
static void __Pyx_ReRaise(void);
static void __Pyx_RaiseWithTraceback(PyObject *, PyObject *, PyObject *);
static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list);
static PyObject *__Pyx_GetExcValue(void);
static PyObject *__Pyx_GetName(PyObject *dict, char *name);

static PyObject *__pyx_m;
static PyObject *__pyx_d;
static PyObject *__pyx_b;


PyObject *__pyx_f_primes(PyObject *__pyx_self, PyObject *__pyx_args); /*proto*/
PyObject *__pyx_f_primes(PyObject *__pyx_self, PyObject *__pyx_args) {
  int __pyx_v_kmax;
  int __pyx_v_n;
  int __pyx_v_k;
  int __pyx_v_i;
  int (__pyx_v_p[1000]);
  PyObject *__pyx_v_result;
  PyObject *__pyx_r;
  PyObject *__pyx_1 = 0;
  int __pyx_2;
  int __pyx_3;
  int __pyx_4;
  PyObject *__pyx_5 = 0;
  PyObject *__pyx_6 = 0;
  if (!PyArg_ParseTuple(__pyx_args, "i", &__pyx_v_kmax)) return 0;
  __pyx_v_result = Py_None; Py_INCREF(__pyx_v_result);

  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":2 */

  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":3 */

  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":4 */
  __pyx_1 = PyList_New(0); if (!__pyx_1) goto __pyx_L1;
  Py_DECREF(__pyx_v_result);
  __pyx_v_result = __pyx_1;
  __pyx_1 = 0;

  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":5 */
  __pyx_2 = (__pyx_v_kmax > 1000);
  if (__pyx_2) {

    /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":6 */
    __pyx_v_kmax = 1000;
    goto __pyx_L2;
  }
  __pyx_L2:;

  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":7 */
  __pyx_v_k = 0;

  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":8 */
  __pyx_v_n = 2;

  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":9 */
  while (1) {
    __pyx_L3:;
    __pyx_2 = (__pyx_v_k < __pyx_v_kmax);
    if (!__pyx_2) break;

    /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":10 */
    __pyx_v_i = 0;

    /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":11 */
    while (1) {
      __pyx_L5:;
      if (__pyx_3 = (__pyx_v_i < __pyx_v_k)) {
        __pyx_3 = ((__pyx_v_n % (__pyx_v_p[__pyx_v_i])) != 0);
      }
      if (!__pyx_3) break;

      /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":12 */
      __pyx_v_i = (__pyx_v_i + 1);
    }
    __pyx_L6:;

    /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":13 */
    __pyx_4 = (__pyx_v_i == __pyx_v_k);
    if (__pyx_4) {

      /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":14 */
      (__pyx_v_p[__pyx_v_k]) = __pyx_v_n;

      /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":15 */
      __pyx_v_k = (__pyx_v_k + 1);

      /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":16 */
      __pyx_1 = PyObject_GetAttrString(__pyx_v_result, "append"); if (!__pyx_1) goto __pyx_L1;
      __pyx_5 = PyInt_FromLong(__pyx_v_n); if (!__pyx_5) goto __pyx_L1;
      __pyx_6 = PyTuple_New(1); if (!__pyx_6) goto __pyx_L1;
      PyTuple_SET_ITEM(__pyx_6, 0, __pyx_5);
      __pyx_5 = 0;
      __pyx_5 = PyObject_CallObject(__pyx_1, __pyx_6); if (!__pyx_5) goto __pyx_L1;
      Py_DECREF(__pyx_6); __pyx_6 = 0;
      Py_DECREF(__pyx_5); __pyx_5 = 0;
      goto __pyx_L7;
    }
    __pyx_L7:;

    /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":17 */
    __pyx_v_n = (__pyx_v_n + 1);
  }
  __pyx_L4:;

  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":18 */
  Py_INCREF(__pyx_v_result);
  __pyx_r = __pyx_v_result;
  goto __pyx_L0;

  __pyx_r = Py_None; Py_INCREF(__pyx_r);
  goto __pyx_L0;
  __pyx_L1:;
  Py_XDECREF(__pyx_1);
  Py_XDECREF(__pyx_5);
  Py_XDECREF(__pyx_6);
  __pyx_r = 0;
  __pyx_L0:;
  Py_DECREF(__pyx_v_result);
  return __pyx_r;
}

static struct PyMethodDef __pyx_methods[] = {
  {"primes", (PyCFunction)__pyx_f_primes, METH_VARARGS, 0},
  {0, 0, 0, 0}
};

void initprimes(void); /*proto*/
void initprimes(void) {
  __pyx_m = Py_InitModule4("primes", __pyx_methods, 0, 0, PYTHON_API_VERSION);
  __pyx_d = PyModule_GetDict(__pyx_m);
  __pyx_b = PyImport_AddModule("__builtin__");
  PyDict_SetItemString(__pyx_d, "__builtins__", __pyx_b);
}/* Runtime support code */
+#include "Python.h"
+
+
+static PyObject *__Pyx_UnpackItem(PyObject *, int);
+static int __Pyx_EndUnpack(PyObject *, int);
+static int __Pyx_PrintItem(PyObject *);
+static int __Pyx_PrintNewline(void);
+static void __Pyx_ReRaise(void);
+static void __Pyx_RaiseWithTraceback(PyObject *, PyObject *, PyObject *);
+static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list);
+static PyObject *__Pyx_GetExcValue(void);
+static PyObject *__Pyx_GetName(PyObject *dict, char *name);
+
+static PyObject *__pyx_m;
+static PyObject *__pyx_d;
+static PyObject *__pyx_b;
+
+
+PyObject *__pyx_f_primes(PyObject *__pyx_self, PyObject *__pyx_args); /*proto*/
+PyObject *__pyx_f_primes(PyObject *__pyx_self, PyObject *__pyx_args) {
+  int __pyx_v_kmax;
+  int __pyx_v_n;
+  int __pyx_v_k;
+  int __pyx_v_i;
+  int (__pyx_v_p[1000]);
+  PyObject *__pyx_v_result;
+  PyObject *__pyx_r;
+  PyObject *__pyx_1 = 0;
+  int __pyx_2;
+  int __pyx_3;
+  int __pyx_4;
+  PyObject *__pyx_5 = 0;
+  PyObject *__pyx_6 = 0;
+  if (!PyArg_ParseTuple(__pyx_args, "i", &__pyx_v_kmax)) return 0;
+  __pyx_v_result = Py_None; Py_INCREF(__pyx_v_result);
+
+  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":2 */
+
+  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":3 */
+
+  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":4 */
+  __pyx_1 = PyList_New(0); if (!__pyx_1) goto __pyx_L1;
+  Py_DECREF(__pyx_v_result);
+  __pyx_v_result = __pyx_1;
+  __pyx_1 = 0;
+
+  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":5 */
+  __pyx_2 = (__pyx_v_kmax > 1000);
+  if (__pyx_2) {
+
+    /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":6 */
+    __pyx_v_kmax = 1000;
+    goto __pyx_L2;
+  }
+  __pyx_L2:;
+
+  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":7 */
+  __pyx_v_k = 0;
+
+  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":8 */
+  __pyx_v_n = 2;
+
+  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":9 */
+  while (1) {
+    __pyx_L3:;
+    __pyx_2 = (__pyx_v_k < __pyx_v_kmax);
+    if (!__pyx_2) break;
+
+    /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":10 */
+    __pyx_v_i = 0;
+
+    /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":11 */
+    while (1) {
+      __pyx_L5:;
+      if (__pyx_3 = (__pyx_v_i < __pyx_v_k)) {
+        __pyx_3 = ((__pyx_v_n % (__pyx_v_p[__pyx_v_i])) != 0);
+      }
+      if (!__pyx_3) break;
+
+      /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":12 */
+      __pyx_v_i = (__pyx_v_i + 1);
+    }
+    __pyx_L6:;
+
+    /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":13 */
+    __pyx_4 = (__pyx_v_i == __pyx_v_k);
+    if (__pyx_4) {
+
+      /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":14 */
+      (__pyx_v_p[__pyx_v_k]) = __pyx_v_n;
+
+      /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":15 */
+      __pyx_v_k = (__pyx_v_k + 1);
+
+      /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":16 */
+      __pyx_1 = PyObject_GetAttrString(__pyx_v_result, "append"); if (!__pyx_1) goto __pyx_L1;
+      __pyx_5 = PyInt_FromLong(__pyx_v_n); if (!__pyx_5) goto __pyx_L1;
+      __pyx_6 = PyTuple_New(1); if (!__pyx_6) goto __pyx_L1;
+      PyTuple_SET_ITEM(__pyx_6, 0, __pyx_5);
+      __pyx_5 = 0;
+      __pyx_5 = PyObject_CallObject(__pyx_1, __pyx_6); if (!__pyx_5) goto __pyx_L1;
+      Py_DECREF(__pyx_6); __pyx_6 = 0;
+      Py_DECREF(__pyx_5); __pyx_5 = 0;
+      goto __pyx_L7;
+    }
+    __pyx_L7:;
+
+    /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":17 */
+    __pyx_v_n = (__pyx_v_n + 1);
+  }
+  __pyx_L4:;
+
+  /* "ProjectsA:Python:Pyrex:Demos:primes.pyx":18 */
+  Py_INCREF(__pyx_v_result);
+  __pyx_r = __pyx_v_result;
+  goto __pyx_L0;
+
+  __pyx_r = Py_None; Py_INCREF(__pyx_r);
+  goto __pyx_L0;
+  __pyx_L1:;
+  Py_XDECREF(__pyx_1);
+  Py_XDECREF(__pyx_5);
+  Py_XDECREF(__pyx_6);
+  __pyx_r = 0;
+  __pyx_L0:;
+  Py_DECREF(__pyx_v_result);
+  return __pyx_r;
+}
+
+static struct PyMethodDef __pyx_methods[] = {
+  {"primes", (PyCFunction)__pyx_f_primes, METH_VARARGS, 0},
+  {0, 0, 0, 0}
+};
+
+void initprimes(void); /*proto*/
+void initprimes(void) {
+  __pyx_m = Py_InitModule4("primes", __pyx_methods, 0, 0, PYTHON_API_VERSION);
+  __pyx_d = PyModule_GetDict(__pyx_m);
+  __pyx_b = PyImport_AddModule("__builtin__");
+  PyDict_SetItemString(__pyx_d, "__builtins__", __pyx_b);
+}
+/* Runtime support code */
--- a/Doc/s5/ui/default/print.css
+++ b/Doc/s5/ui/default/print.css
-/* The following rule is necessary to have all slides appear in print! DO NOT REMOVE IT! */
-.slide, ul {page-break-inside: avoid; visibility: visible !important;}
-h1 {page-break-after: avoid;}
-
-body {font-size: 12pt; background: white;}
-* {color: black;}
-
-#slide0 h1 {font-size: 200%; border: none; margin: 0.5em 0 0.25em;}
-#slide0 h3 {margin: 0; padding: 0;}
-#slide0 h4 {margin: 0 0 0.5em; padding: 0;}
-#slide0 {margin-bottom: 3em;}
-
-h1 {border-top: 2pt solid gray; border-bottom: 1px dotted silver;}
-.extra {background: transparent !important;}
-div.extra, pre.extra, .example {font-size: 10pt; color: #333;}
-ul.extra a {font-weight: bold;}
-p.example {display: none;}
-
-#header {display: none;}
-#footer h1 {margin: 0; border-bottom: 1px solid; color: gray; font-style: italic;}
-#footer h2, #controls {display: none;}
-
-/* The following rule keeps the layout stuff out of print.  Remove at your own risk! */
-.layout, .layout * {display: none !important;}
+/* The following rule is necessary to have all slides appear in print! DO NOT REMOVE IT! */
+.slide, ul {page-break-inside: avoid; visibility: visible !important;}
+h1 {page-break-after: avoid;}
+
+body {font-size: 12pt; background: white;}
+* {color: black;}
+
+#slide0 h1 {font-size: 200%; border: none; margin: 0.5em 0 0.25em;}
+#slide0 h3 {margin: 0; padding: 0;}
+#slide0 h4 {margin: 0 0 0.5em; padding: 0;}
+#slide0 {margin-bottom: 3em;}
+
+h1 {border-top: 2pt solid gray; border-bottom: 1px dotted silver;}
+.extra {background: transparent !important;}
+div.extra, pre.extra, .example {font-size: 10pt; color: #333;}
+ul.extra a {font-weight: bold;}
+p.example {display: none;}
+
+#header {display: none;}
+#footer h1 {margin: 0; border-bottom: 1px solid; color: gray; font-style: italic;}
+#footer h2, #controls {display: none;}
+
+/* The following rule keeps the layout stuff out of print.  Remove at your own risk! */
+.layout, .layout * {display: none !important;}