[Python-apps-commits] r2273 - in packages/pyflakes/trunk/debian/patches (4 files)
mithrandi-guest at users.alioth.debian.org
mithrandi-guest at users.alioth.debian.org
Fri Jan 30 18:29:38 UTC 2009
Date: Friday, January 30, 2009 @ 18:29:37
Author: mithrandi-guest
Revision: 2273
Refresh patches.
Modified:
packages/pyflakes/trunk/debian/patches/add_main_function.diff
packages/pyflakes/trunk/debian/patches/always_close_fd.diff
packages/pyflakes/trunk/debian/patches/check_encoding_errors.diff
packages/pyflakes/trunk/debian/patches/set_exit_status.diff
Modified: packages/pyflakes/trunk/debian/patches/add_main_function.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/add_main_function.diff 2009-01-29 19:28:51 UTC (rev 2272)
+++ packages/pyflakes/trunk/debian/patches/add_main_function.diff 2009-01-30 18:29:37 UTC (rev 2273)
@@ -1,7 +1,5 @@
# fix arguments passing to main function
-Index: b/bin/pyflakes
-===================================================================
--- a/bin/pyflakes
+++ b/bin/pyflakes
@@ -1,4 +1,5 @@
@@ -13,10 +11,10 @@
+main(sys.argv[1:])
--- a/pyflakes/scripts/pyflakes.py
+++ b/pyflakes/scripts/pyflakes.py
-@@ -37,9 +37,8 @@
- return check(file(filename, 'U').read() + '\n', filename)
+@@ -46,9 +46,8 @@
+ print >> sys.stderr, '%s: no such file' % (filename,)
+ return 1
-
-def main():
+def main(args):
warnings = 0
Modified: packages/pyflakes/trunk/debian/patches/always_close_fd.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/always_close_fd.diff 2009-01-29 19:28:51 UTC (rev 2272)
+++ packages/pyflakes/trunk/debian/patches/always_close_fd.diff 2009-01-30 18:29:37 UTC (rev 2273)
@@ -2,7 +2,7 @@
--- a/pyflakes/scripts/pyflakes.py
+++ b/pyflakes/scripts/pyflakes.py
-@@ -39,7 +39,11 @@ def checkPath(filename):
+@@ -41,7 +41,11 @@
@return: the number of warnings printed
"""
if os.path.exists(filename):
Modified: packages/pyflakes/trunk/debian/patches/check_encoding_errors.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/check_encoding_errors.diff 2009-01-29 19:28:51 UTC (rev 2272)
+++ packages/pyflakes/trunk/debian/patches/check_encoding_errors.diff 2009-01-30 18:29:37 UTC (rev 2273)
@@ -1,12 +1,10 @@
# Handle Unicode errors gracefully
-Index: b/bin/pyflakes
-===================================================================
--- a/pyflakes/scripts/pyflakes.py
+++ b/pyflakes/scripts/pyflakes.py
-@@ -24,6 +24,9 @@
+@@ -26,6 +26,9 @@
print >> sys.stderr, line
- print >> sys.stderr, " " * (offset-2), "^"
+ print >> sys.stderr, " " * offset, "^"
return 1
+ except UnicodeError, msg:
+ print >> sys.stderr, 'encoding error at %r: %s' % (filename, msg)
Modified: packages/pyflakes/trunk/debian/patches/set_exit_status.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/set_exit_status.diff 2009-01-29 19:28:51 UTC (rev 2272)
+++ packages/pyflakes/trunk/debian/patches/set_exit_status.diff 2009-01-30 18:29:37 UTC (rev 2273)
@@ -1,7 +1,5 @@
# fixed duplicated output
-Index: b/bin/pyflakes
-===================================================================
--- a/bin/pyflakes
+++ b/bin/pyflakes
@@ -2,4 +2,4 @@
@@ -12,7 +10,7 @@
+sys.exit(main(sys.argv[1:]))
--- a/pyflakes/scripts/pyflakes.py
+++ b/pyflakes/scripts/pyflakes.py
-@@ -55,4 +61,4 @@
+@@ -64,4 +64,4 @@
else:
warnings += check(sys.stdin.read(), '<stdin>')
More information about the Python-apps-commits
mailing list