[pyflakes] Bring back null byte input traceback patch. Include LICENSE and NEWS.txt in docs.

Ville Skyttä scop at fedoraproject.org
Mon Sep 5 05:39:02 UTC 2011


commit d688751757853253c5bebb6c806353a77a2a861d
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Sep 5 08:37:04 2011 +0300

    Bring back null byte input traceback patch.
    Include LICENSE and NEWS.txt in docs.

 pyflakes-0.4.0-python27-677032.patch               |   21 --------------------
 ....patch => pyflakes-0.5.0-nullbytes-691164.patch |   14 +++++-------
 pyflakes.spec                                      |   10 +++++++-
 3 files changed, 14 insertions(+), 31 deletions(-)
---
diff --git a/pyflakes-0.4.0-nullbytes-691164.patch b/pyflakes-0.5.0-nullbytes-691164.patch
similarity index 63%
rename from pyflakes-0.4.0-nullbytes-691164.patch
rename to pyflakes-0.5.0-nullbytes-691164.patch
index aa1209d..614100e 100644
--- a/pyflakes-0.4.0-nullbytes-691164.patch
+++ b/pyflakes-0.5.0-nullbytes-691164.patch
@@ -1,7 +1,7 @@
-diff -up pyflakes-0.4.0/pyflakes/scripts/pyflakes.py~ pyflakes-0.4.0/pyflakes/scripts/pyflakes.py
---- pyflakes-0.4.0/pyflakes/scripts/pyflakes.py~	2011-04-04 00:13:37.729680847 +0300
-+++ pyflakes-0.4.0/pyflakes/scripts/pyflakes.py	2011-04-04 01:09:54.113715068 +0300
-@@ -57,6 +57,22 @@ def check(codeString, filename):
+diff -up pyflakes-0.5.0/pyflakes/scripts/pyflakes.py~ pyflakes-0.5.0/pyflakes/scripts/pyflakes.py
+--- pyflakes-0.5.0/pyflakes/scripts/pyflakes.py~	2011-09-03 19:02:29.000000000 +0300
++++ pyflakes-0.5.0/pyflakes/scripts/pyflakes.py	2011-09-05 08:15:16.684850293 +0300
+@@ -50,6 +50,22 @@ def check(codeString, filename):
                  print >> sys.stderr, " " * offset, "^"
  
          return 1
@@ -22,7 +22,5 @@ diff -up pyflakes-0.4.0/pyflakes/scripts/pyflakes.py~ pyflakes-0.4.0/pyflakes/sc
 +                return 1
 +        raise
      else:
-         # Okay, it's syntactically valid.  Now parse it into an ast and check
-         # it.
-diff -up pyflakes-0.4.0/t.py~ pyflakes-0.4.0/t.py
-Binary files pyflakes-0.4.0/t.py~ and pyflakes-0.4.0/t.py differ
+         # Okay, it's syntactically valid.  Now check it.
+         w = checker.Checker(tree, filename)
diff --git a/pyflakes.spec b/pyflakes.spec
index f7755c5..3e399d3 100644
--- a/pyflakes.spec
+++ b/pyflakes.spec
@@ -2,7 +2,7 @@
 
 Name:           pyflakes
 Version:        0.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Lint-like tool for Python
 
 Group:          Development/Languages
@@ -11,6 +11,7 @@ URL:            https://launchpad.net/pyflakes
 
 Source0:        http://pypi.python.org/packages/source/p/pyflakes/pyflakes-%{version}.tar.gz
 Patch0:         http://ftp.debian.org/debian/pool/main/p/pyflakes/pyflakes_0.4.0-1.diff.gz
+Patch1:         pyflakes-0.5.0-nullbytes-691164.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,6 +29,7 @@ it runs on most large projects in only a few seconds.
 %setup -q
 %patch0 -p1
 %{__patch} -p1 -s -F 0 -i debian/patches/always_close_fd.diff
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -45,13 +47,17 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc PKG-INFO
+%doc LICENSE NEWS.txt PKG-INFO
 %{_bindir}/pyflakes
 %{python_sitelib}/pyflakes*
 %exclude %{python_sitelib}/pyflakes/test/
 %{_mandir}/man1/pyflakes.1*
 
 %changelog
+* Mon Sep  5 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.5.0-2
+- Bring back null byte input traceback patch.
+- Include LICENSE and NEWS.txt in docs.
+
 * Sun Sep  4 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.5.0-1
 - Update to 0.5.0
 - Remove patches that no longer apply


More information about the scm-commits mailing list