Merge pull request #5404 from poncovka/master-remove_timezone_map

Remove the timezone map from the Time & Date spoke

anaconda.spec.in

@@ -35,7 +35,6 @@ Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{vers
 %define libarchivever 3.0.4
 %define libblockdevver 2.1
 %define libreportanacondaver 2.0.21-1
-%define libtimezonemapver 0.4.1-2
 %define libxklavierver 5.4
 %define mehver 0.23-1
 %define nmver 1.0
@@ -70,7 +69,6 @@ BuildRequires: libarchive-devel >= %{libarchivever}
 %ifarch s390 s390x
 BuildRequires: s390utils-devel
 %endif
-BuildRequires: libtimezonemap-devel >= %{libtimezonemapver}
 
 # Tools used by the widgets resource bundle generation
 BuildRequires: gdk-pixbuf2-devel
@@ -278,7 +276,6 @@ Requires: adwaita-icon-theme
 Requires: tigervnc-server-minimal
 Requires: libxklavier >= %{libxklavierver}
 Requires: libgnomekbd
-Requires: libtimezonemap >= %{libtimezonemapver}
 Requires: nm-connection-editor
 %ifnarch s390 s390x
 Requires: NetworkManager-wifi

docs/release-notes/redesign_gui_time_date_spoke.rst

@@ -0,0 +1,11 @@
+:Type: GUI
+:Summary: Redesign the Time & Date spoke in GUI
+
+:Description:
+    The timezone map was removed from the Time & Date spoke in the GKT-based user interface
+    and the spoke was redesigned to accommodate the changes. The installer no longer depends
+    on the the ``libtimezonemap`` package.
+
+:Links:
+    - https://github.com/rhinstaller/anaconda/issues/5404
+    - https://github.com/rhinstaller/anaconda/discussions/5355

pyanaconda/timezone.py

@@ -117,22 +117,40 @@ def get_all_regions_and_timezones():
     Get a dictionary mapping the regions to the list of their timezones.
 
     :rtype: dict
-
     """
-
     result = OrderedDict()
 
     for tz in sorted(all_timezones()):
-        parts = tz.split("/", 1)
+        region, city = parse_timezone(tz)
 
-        if len(parts) > 1:
-            if parts[0] not in result:
-                result[parts[0]] = set()
-            result[parts[0]].add(parts[1])
+        if region and city:
+            result.setdefault(region, set())
+            result[region].add(city)
 
     return result
 
 
+def parse_timezone(timezone):
+    """Parse the specified timezone.
+
+    Return empty strings if the timezone cannot be parsed.
+
+    :return: a region and a city
+    :rtype: a tuple of strings
+    """
+    try:
+        region, city = timezone.split("/", 1)
+
+        if region and city:
+            return region, city
+
+    except ValueError:
+        pass
+
+    log.debug("Invalid timezone: %s", timezone)
+    return "", ""
+
+
 def is_valid_timezone(timezone):
     """
     Check if a given string is an existing timezone.