[Skencil-commits] r516 - in skencil/branches/skencil-0.6: . Sketch/Modules

[scm-commit at wald.intevation.org]

Author: bh
Date: 2006-01-29 20:01:18 +0100 (Sun, 29 Jan 2006)
New Revision: 516

Modified:
   skencil/branches/skencil-0.6/ChangeLog
   skencil/branches/skencil-0.6/Sketch/Modules/curveobject.c
Log:

* Sketch/Modules/curveobject.c (curve_append_from_file): Allow any
object as parameter.  PyFile_GetLine can deal not only with real
file objects, i.e. ones whose type is PyFile_Type, but any object
which has a readline method.
Backport from trunk


Modified: skencil/branches/skencil-0.6/ChangeLog
===================================================================
--- skencil/branches/skencil-0.6/ChangeLog	2006-01-29 17:40:45 UTC (rev 515)
+++ skencil/branches/skencil-0.6/ChangeLog	2006-01-29 19:01:18 UTC (rev 516)
@@ -1,5 +1,15 @@
 2006-01-29  Bernhard Herzog  <bh at intevation.de>
 
+	* Sketch/Modules/curveobject.c (curve_append_from_file): Allow any
+	object as parameter.  PyFile_GetLine can deal not only with real
+	file objects, i.e. ones whose type is PyFile_Type, but any object
+	which has a readline method.
+	Backport from trunk
+
+2006-01-29  Bernhard Herzog  <bh at intevation.de>
+
+	Merge -r 512:513 from trunk:
+
 	* Sketch/Modules/curveobject.c (curve_parse_string_append),
 	Sketch/Modules/skreadmodule.c (sklex),
 	Sketch/Modules/pstokenize.c (read_name_or_number): Set LC_NUMERIC

Modified: skencil/branches/skencil-0.6/Sketch/Modules/curveobject.c
===================================================================
--- skencil/branches/skencil-0.6/Sketch/Modules/curveobject.c	2006-01-29 17:40:45 UTC (rev 515)
+++ skencil/branches/skencil-0.6/Sketch/Modules/curveobject.c	2006-01-29 19:01:18 UTC (rev 516)
@@ -1539,7 +1539,7 @@
     PyObject * line = NULL;
     const char *buf;
 
-    if (!PyArg_ParseTuple(args, "O!", &PyFile_Type, &pyfile))
+    if (!PyArg_ParseTuple(args, "O", &pyfile))
 	return NULL;
 
     while ((line = PyFile_GetLine(pyfile, 0)) && (PyString_Size(line) != 0))