[python-astroid/f19] - Upstream v1.0.1 Drop patch included in upstream - Add patch to fix gobject introspection of ille
Brian C. Lane
bcl at fedoraproject.org
Sat Mar 1 00:34:33 UTC 2014
commit 8780d83d6d261789ed1652c86757f4dad024d9e6
Author: Brian C. Lane <bcl at redhat.com>
Date: Thu Feb 27 09:33:08 2014 -0800
- Upstream v1.0.1
Drop patch included in upstream
- Add patch to fix gobject introspection of illegal symbol names (dshea)
.gitignore | 1 +
...-illegal-symbols-in-gobject-introspection.patch | 50 ++++++++++++++++++++
...n-namedtuple-inference-we-should-add-an-a.patch | 28 -----------
python-astroid.spec | 27 +++++++----
sources | 2 +-
5 files changed, 69 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f767b7c..f47b7e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/astroid-version-1.0.0.tar.bz2
+/astroid-version-1.0.1.tar.bz2
diff --git a/0001-Ignore-illegal-symbols-in-gobject-introspection.patch b/0001-Ignore-illegal-symbols-in-gobject-introspection.patch
new file mode 100644
index 0000000..0098b5f
--- /dev/null
+++ b/0001-Ignore-illegal-symbols-in-gobject-introspection.patch
@@ -0,0 +1,50 @@
+From 24116cfe98d40c51cbbf24059460b9910064c93e Mon Sep 17 00:00:00 2001
+From: David Shea <dshea at redhat.com>
+Date: Fri, 28 Feb 2014 12:00:52 -0800
+Subject: [PATCH] Ignore illegal symbols in gobject introspection
+
+See upstream bug:
+
+https://bitbucket.org/logilab/astroid/issue/19/syntaxerror-when-examining-gi-modules
+
+gobject introspection can result in symbols that are not valid in
+python. Ignore them.
+---
+ brain/py2gi.py | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/brain/py2gi.py b/brain/py2gi.py
+index 5001b7c..b001625 100644
+--- a/brain/py2gi.py
++++ b/brain/py2gi.py
+@@ -5,6 +5,7 @@ Helps with understanding everything imported from 'gi.repository'
+
+ import inspect
+ import sys
++import re
+
+ from astroid import MANAGER, AstroidBuildingException
+ from astroid.builder import AstroidBuilder
+@@ -12,6 +13,7 @@ from astroid.builder import AstroidBuilder
+
+ _inspected_modules = {}
+
++_identifier_re = r'^[A-Za-z_]\w*$'
+
+ def _gi_build_stub(parent):
+ """
+@@ -26,6 +28,11 @@ def _gi_build_stub(parent):
+ if not name or name.startswith("__"):
+ # GLib.IConv has a parameter named "" :/
+ continue
++
++ # Check if this is a valid name in python
++ if not re.match(_identifier_re, name):
++ continue
++
+ try:
+ obj = getattr(parent, name)
+ except:
+--
+1.8.5.3
+
diff --git a/python-astroid.spec b/python-astroid.spec
index 90a940b..887fb35 100644
--- a/python-astroid.spec
+++ b/python-astroid.spec
@@ -5,30 +5,30 @@
%endif
# This needs to be pulled from the source tarball
-%global commit 1d6914a1a1a0
+%global commit f67f24131b3a
Name: python-astroid
-Version: 1.0.0
-Release: 5%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
Summary: Python Abstract Syntax Tree New Generation
Group: Development/Languages
License: GPLv2+
URL: http://www.astroid.org
Source0: https://bitbucket.org/logilab/astroid/get/astroid-version-%{version}.tar.bz2
-Patch0: 0001-fix-error-in-namedtuple-inference-we-should-add-an-a.patch
+Patch0: 0001-Ignore-illegal-symbols-in-gobject-introspection.patch
Provides: python-astroid = %{version}-%{release}
Obsoletes: python-logilab-astng <= 0.24.1-3
BuildArch: noarch
-BuildRequires: python-devel python-setuptools
-BuildRequires: python-logilab-common >= 0.60.0
-Requires: python-logilab-common >= 0.60.0
+BuildRequires: python-devel python-setuptools python-tools
+BuildRequires: python-logilab-common >= 0.61.0
+Requires: python-logilab-common >= 0.61.0
%if 0%{?with_python3}
-BuildRequires: python3-devel python3-setuptools
-BuildRequires: python3-logilab-common >= 0.60.0
+BuildRequires: python3-devel python3-setuptools python3-tools
+BuildRequires: python3-logilab-common >= 0.61.0
%endif # if with_python3
%description
@@ -41,7 +41,7 @@ python module with some additional methods and attributes.
%package -n python3-astroid
Summary: Python Abstract Syntax Tree New Generation
Group: Development/Languages
-Requires: python3-logilab-common >= 0.60.0
+Requires: python3-logilab-common >= 0.61.0
%description -n python3-astroid
The aim of this module is to provide a common base representation of
@@ -115,6 +115,13 @@ popd
%endif # with_python3
%changelog
+* Fri Feb 28 2014 Brian C. Lane <bcl at redhat.com> 1.0.1-1
+- Add patch to fix gobject introspection of illegal symbol names (dshea)
+
+* Thu Feb 27 2014 Brian C. Lane <bcl at redhat.com> 1.0.1-1
+- Upstream v1.0.1
+ Drop patch included in upstream
+
* Tue Sep 17 2013 Brian C. Lane <bcl at redhat.com> 1.0.0-5
- Switch to versioned obsolete. (#996780)
diff --git a/sources b/sources
index b19dbc8..729f108 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7aeaf5b02af4526e577ba5787243445 astroid-version-1.0.0.tar.bz2
+556daeab0e496795ae791992cc373ca0 astroid-version-1.0.1.tar.bz2
More information about the scm-commits
mailing list