diff --git a/.gitignore b/.gitignore index f67ec9c..361446a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /astroid-1.3.7.tar.bz2 /astroid-1.4.1.tar.bz2 /astroid-1.4.1.tar.gz +/astroid-1.4.3.tar.gz diff --git a/0001-UnicodeEncodeError-in-AsStringVisitor.visit_function.patch b/0001-UnicodeEncodeError-in-AsStringVisitor.visit_function.patch deleted file mode 100644 index 13d2a2d..0000000 --- a/0001-UnicodeEncodeError-in-AsStringVisitor.visit_function.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 9a6736f8e714297eb11bbbbfd7e01db5396673ec Mon Sep 17 00:00:00 2001 -From: Fedora Ninjas -Date: Mon, 30 Nov 2015 15:08:02 -0800 -Subject: [PATCH] UnicodeEncodeError in AsStringVisitor.visit_functiondef - -Fix from upstream issue tracker: -https://bitbucket.org/logilab/astroid/issues/273/regression-unicodeencodeerror-in ---- - astroid/as_string.py | 14 +++++++------- - astroid/tests/unittest_regrtest.py | 17 +++++++++++++++++ - 2 files changed, 24 insertions(+), 7 deletions(-) - -diff --git a/astroid/as_string.py b/astroid/as_string.py -index d7786fe..829c69b 100644 ---- a/astroid/as_string.py -+++ b/astroid/as_string.py -@@ -287,13 +287,13 @@ class AsStringVisitor(object): - trailer = return_annotation + ":" - else: - trailer = ":" -- def_format = "\n{decorators}def {name}({args}){trailer}{docs}\n{body}" -- return def_format.format(decorators=decorate, -- name=node.name, -- args=node.args.accept(self), -- trailer=trailer, -- docs=docs, -- body=self._stmt_list(node.body)) -+ def_format = "\n%sdef %s(%s)%s%s\n%s" -+ return def_format % (decorate, -+ node.name, -+ node.args.accept(self), -+ trailer, -+ docs, -+ self._stmt_list(node.body)) - - def visit_generatorexp(self, node): - """return an astroid.GeneratorExp node as string""" -diff --git a/astroid/tests/unittest_regrtest.py b/astroid/tests/unittest_regrtest.py -index 3e22152..b255bfe 100644 ---- a/astroid/tests/unittest_regrtest.py -+++ b/astroid/tests/unittest_regrtest.py -@@ -282,6 +282,23 @@ def test(): - ''') - self.assertRaises(exceptions.InferenceError, next, node.infer()) - -+ def test_unicode_in_docstring(self): -+ # Crashed for astroid==1.4.1 -+ # Test for https://bitbucket.org/logilab/astroid/issues/273/ -+ -+ # In a regular file, "coding: utf-8" would have been used. -+ node = extract_node(u''' -+ from __future__ import unicode_literals -+ -+ class MyClass(object): -+ def method(self): -+ "With unicode : %s " -+ -+ instance = MyClass() -+ ''' % u"\u2019") -+ -+ next(node.value.infer()).as_string() -+ - - class Whatever(object): - a = property(lambda x: x, lambda x: x) --- -2.5.0 - diff --git a/0002-Check-for-flags-enum-types-before-checking-for-int.patch b/0002-Check-for-flags-enum-types-before-checking-for-int.patch deleted file mode 100644 index 47037c9..0000000 --- a/0002-Check-for-flags-enum-types-before-checking-for-int.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b0fdfe55e8428f3a9a141f70632607d6bf0d9bb2 Mon Sep 17 00:00:00 2001 -From: David Shea -Date: Fri, 11 Dec 2015 15:04:21 -0500 -Subject: [PATCH] Check for flags/enum types before checking for int - -gobject-introspection enum and flag types inherit from int, so the check -for a unusable string represenation needs to happen before checking if -the values can be used as integers. This fixes syntax errors in the -generated stubs for gobject-introspection modules containing flag and -enum types. ---- - astroid/brain/brain_gi.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/astroid/brain/brain_gi.py b/astroid/brain/brain_gi.py -index d2c133d..62b013c 100644 ---- a/astroid/brain/brain_gi.py -+++ b/astroid/brain/brain_gi.py -@@ -47,13 +47,13 @@ def _gi_build_stub(parent): - elif (inspect.ismethod(obj) or - inspect.ismethoddescriptor(obj)): - methods[name] = obj -- elif isinstance(obj, (int, str)): -- constants[name] = obj - elif (str(obj).startswith(" $FILE.utf8 - mv -f $FILE.utf8 $FILE -done popd %endif # with_python3 %{__python} setup.py install -O1 --skip-build --root %{buildroot} rm -rf %{buildroot}%{python_sitelib}/astroid/tests -# Fix encoding in readme -for FILE in README; do - iconv -f iso-8859-15 -t utf-8 $FILE > $FILE.utf8 - mv -f $FILE.utf8 $FILE -done %files -%doc README COPYING +%doc README.rst +%license COPYING %{python_sitelib}/astroid %{python_sitelib}/astroid*.egg-info %if 0%{?with_python3} %files -n python3-astroid -%doc README COPYING +%doc README.rst +%license COPYING %{python3_sitelib}/astroid %{python3_sitelib}/astroid*.egg-info %endif # with_python3 %changelog +* Mon Jan 04 2016 Brian C. Lane 1.4.3-1 +- Upstream 1.4.3 +- Drop included patches +- Drop running iconv on README.rst + * Fri Dec 11 2015 Brian C. Lane 1.4.1-2 - Check for flags/enum types before checking for int Upstream PR https://github.com/PyCQA/astroid/pull/287 diff --git a/sources b/sources index de479b1..f3f4c99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed70bfed5e4b25be4292e7fe72da2c02 astroid-1.4.1.tar.gz +4647159de7d4d0c4b1de23ecbfb8e246 astroid-1.4.3.tar.gz