[kernel] r17392 - dists/trunk/linux-2.6/debian/templates

[Ben Hutchings]

Author: benh
Date: Thu May 12 01:17:25 2011
New Revision: 17392

Log:
Add optional parameters to our showwarning() implementation

The fixed 4-parameter function signature is deprecated since Python 2.6.

Modified:
   dists/trunk/linux-2.6/debian/templates/patch.apply.in

Modified: dists/trunk/linux-2.6/debian/templates/patch.apply.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/patch.apply.in	Wed May 11 13:24:48 2011	(r17391)
+++ dists/trunk/linux-2.6/debian/templates/patch.apply.in	Thu May 12 01:17:25 2011	(r17392)
@@ -215,8 +215,9 @@
     return options, args
 
 if __name__ == '__main__':
-    def showwarning(message, category, filename, lineno):
-        sys.stderr.write("Warning: %s\n" % message)
+    def showwarning(message, category, filename, lineno,
+                    file=sys.stderr, line=''):
+        file.write("Warning: %s\n" % message)
     import warnings
     warnings.showwarning = showwarning
     try: