[Python-modules-commits] r2437 - in /packages/python-tclink/trunk/debian: patches/ patches/00dpatch.conf patches/00list patches/py_tclink-type-error-fix.dpatch pyversions rules

Sat May 19 18:13:59 UTC 2007

Author: bzed-guest
Date: Sat May 19 18:13:59 2007
New Revision: 2437

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2437
Log:
bugfix

Added:
    packages/python-tclink/trunk/debian/patches/
    packages/python-tclink/trunk/debian/patches/00dpatch.conf
    packages/python-tclink/trunk/debian/patches/00list
    packages/python-tclink/trunk/debian/patches/py_tclink-type-error-fix.dpatch   (with props)
Modified:
    packages/python-tclink/trunk/debian/pyversions
    packages/python-tclink/trunk/debian/rules

Added: packages/python-tclink/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/python-modules/packages/python-tclink/trunk/debian/patches/00dpatch.conf?rev=2437&op=file
==============================================================================

--- packages/python-tclink/trunk/debian/patches/00dpatch.conf (added)
+++ packages/python-tclink/trunk/debian/patches/00dpatch.conf Sat May 19 18:13:59 2007
@@ -1,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs

Added: packages/python-tclink/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/python-tclink/trunk/debian/patches/00list?rev=2437&op=file
==============================================================================
--- packages/python-tclink/trunk/debian/patches/00list (added)
+++ packages/python-tclink/trunk/debian/patches/00list Sat May 19 18:13:59 2007
@@ -1,0 +1,1 @@
+py_tclink-type-error-fix

Added: packages/python-tclink/trunk/debian/patches/py_tclink-type-error-fix.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-tclink/trunk/debian/patches/py_tclink-type-error-fix.dpatch?rev=2437&op=file
==============================================================================
--- packages/python-tclink/trunk/debian/patches/py_tclink-type-error-fix.dpatch (added)
+++ packages/python-tclink/trunk/debian/patches/py_tclink-type-error-fix.dpatch Sat May 19 18:13:59 2007
@@ -1,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## py_tclink-type-error-fix.dpatch by  <bzed at think.toad.homelinux.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad python-tclink~/py_tclink.c python-tclink/py_tclink.c
+--- python-tclink~/py_tclink.c	2003-09-06 00:47:36.000000000 +0200
++++ python-tclink/py_tclink.c	2007-05-11 09:20:53.000000000 +0200
+@@ -1,9 +1,9 @@
+ /* tclink.c - Library code for the TCLink client API.
+  *
+- * TCLink Copyright (c) 2003 TrustCommerce.
++ * TCLink Copyright (c) 2007 TrustCommerce.
+  * http://www.trustcommerce.com
+  * developer at trustcommerce.com
+- * (626) 744-7700
++ * (949) 387-3747
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -31,6 +31,7 @@
+ 	PyObject *input, *output;
+ 	PyObject *key, *value;
+ 	int pos = 0;
++	char *key_str, *value_str;
+ 
+ 	TCLinkHandle handle;
+ 	TCLinkCon *c;
+@@ -43,8 +44,19 @@
+ 	/* stuff the parameters */
+ 	handle = TCLinkCreate();
+ 
+-	while (PyDict_Next(input, &pos, &key, &value))
+-		TCLinkPushParam(handle, PyString_AsString(key), PyString_AsString(value));
++	while (PyDict_Next(input, &pos, &key, &value)) {
++	        key_str = PyString_AsString(key);
++		if (key_str == NULL) {
++		        TCLinkDestroy(handle);
++			return NULL;
++		}
++	        value_str = PyString_AsString(value);
++		if (value_str == NULL) {
++		        TCLinkDestroy(handle);
++			return NULL;
++		}
++		TCLinkPushParam(handle, key_str, value_str);
++	}
+ 
+ 	Py_BEGIN_ALLOW_THREADS
+ 
+@@ -87,7 +99,7 @@
+ 
+ void inittclink(void)
+ {
+-  char *trustcommerce_documentation = "The TCLink Python module is a thin client to allow e-commerce application to run credit card transactions over the Internet.  Please visit http://www.trustcommerce.com/tclink.html for more info, or write to developer at trustcommerce.com.\n";
++  char *trustcommerce_documentation = "The TCLink Python module is a thin client to allow e-commerce application to run credit card transactions over the Internet.  You can visit us at http://www.trustcommerce.com or write to developer at trustcommerce.com.\n";
+ 
+   TCLinkCreate((PyObject *)NULL, (PyObject *)NULL);
+   Py_InitModule3("tclink", trustcommerceMethods, trustcommerce_documentation);

Propchange: packages/python-tclink/trunk/debian/patches/py_tclink-type-error-fix.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/python-tclink/trunk/debian/pyversions
URL: http://svn.debian.org/wsvn/python-modules/packages/python-tclink/trunk/debian/pyversions?rev=2437&op=diff
==============================================================================
--- packages/python-tclink/trunk/debian/pyversions (original)
+++ packages/python-tclink/trunk/debian/pyversions Sat May 19 18:13:59 2007
@@ -1,1 +1,1 @@
-2.4
+2.4-

Modified: packages/python-tclink/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-tclink/trunk/debian/rules?rev=2437&op=diff
==============================================================================
--- packages/python-tclink/trunk/debian/rules (original)
+++ packages/python-tclink/trunk/debian/rules Sat May 19 18:13:59 2007
@@ -5,4 +5,5 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 


