From 8e0f17b975050c3b60f7e21181e4f78aab32c430 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Jul 06 2018 22:26:17 +0000
Subject: Fix a compose-breaking crash with Python 3.7 (#1598574)


---

diff --git a/0001-Make-pyanaconda.dbus.typing-work-with-Python-3.7-159.patch b/0001-Make-pyanaconda.dbus.typing-work-with-Python-3.7-159.patch
new file mode 100644
index 0000000..004fc4d
--- /dev/null
+++ b/0001-Make-pyanaconda.dbus.typing-work-with-Python-3.7-159.patch
@@ -0,0 +1,64 @@
+From 38b9f3206d86cded04c52e52b0d627079ba44acc Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Fri, 6 Jul 2018 15:04:39 -0700
+Subject: [PATCH] Make pyanaconda.dbus.typing work with Python 3.7 (#1598574)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As reported in RHBZ#1598574, the internals of typing changed in
+Python 3.7 such that it's no longer so simple to find the 'base'
+type of a type hint (it's not just its `__origin__` any more).
+There doesn't appear to be any particularly great fix for this,
+but this suggestion from Miro Hrončok seems as good as any other
+option we have for now. This should work with both 3.6 and 3.7.
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ pyanaconda/dbus/typing.py | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/pyanaconda/dbus/typing.py b/pyanaconda/dbus/typing.py
+index ea8a2999c..1cb1ea99a 100644
+--- a/pyanaconda/dbus/typing.py
++++ b/pyanaconda/dbus/typing.py
+@@ -149,24 +149,30 @@ class DBusType(object):
+     @staticmethod
+     def _is_container_type(type_hint):
+         """Is it a container type?"""
+-        # Try to get the "base" type of the container type.
++        # Try to get the "origin" of the hint.
+         origin = getattr(type_hint, "__origin__", None)
+-        return origin in DBusType._container_type_mapping
++        if origin:
++            # Return true if the "origin" is a subclass of a container type
++            # see https://bugzilla.redhat.com/show_bug.cgi?id=1598574
++            return any(issubclass(origin, contype) for contype in DBusType._container_type_mapping)
++        return False
+ 
+     @staticmethod
+     def _get_container_type(type_hint):
+         """Return a container type."""
+-        # Get the "base" type of the container.
+-        origin = type_hint.__origin__
++        # Get the "base" type via the "origin" of the hint
++        # see https://bugzilla.redhat.com/show_bug.cgi?id=1598574
++        basetype = tuple(contype for contype in DBusType._container_type_mapping
++                       if issubclass(type_hint.__origin__, contype))[0]
+         # Get the arguments of the container.
+         args = type_hint.__args__
+ 
+         # Check the typing.
+-        if origin == Dict:
++        if basetype == Dict:
+             DBusType._check_if_valid_dictionary(type_hint)
+ 
+         # Generate string.
+-        container = DBusType._container_type_mapping[origin]
++        container = DBusType._container_type_mapping[basetype]
+         items = [DBusType.get_dbus_representation(arg) for arg in args]
+         return container % "".join(items)
+ 
+-- 
+2.18.0.rc2
+
diff --git a/anaconda.spec b/anaconda.spec
index f1643d3..7070a70 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -7,7 +7,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 29.19
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -19,6 +19,10 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # make dist
 Source0: %{name}-%{version}.tar.bz2
 
+# Fix for RHBZ#1598574, a compose-breaking crash with Python 3.7
+# https://github.com/rhinstaller/anaconda/pull/1526
+Patch0: 0001-Make-pyanaconda.dbus.typing-work-with-Python-3.7-159.patch
+
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
@@ -250,6 +254,7 @@ runtime on NFS/HTTP/FTP servers or local disks.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # use actual build-time release number, not tarball creation time release number
@@ -347,6 +352,9 @@ update-desktop-database &> /dev/null || :
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Fri Jul 06 2018 Adam Williamson <awilliam@redhat.com> - 29.19-3
+- Fix a compose-breaking crash with Python 3.7 (#1598574)
+
 * Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 29.19-2
 - Rebuilt for Python 3.7