# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1622123722 -10800
# Node ID 71e66eca1e23aab2e1a92ec54009be38f11a727e
# Parent  301452a71cc7c367e422ca0d3d2adc94b5318aa7# Parent  884770576e747ce415b87d80841e660ecfe34a72
Merge.

diff -r 301452a71cc7 -r 71e66eca1e23 lxmldump.py
--- a/lxmldump.py	Thu May 27 10:49:44 2021 +0300
+++ b/lxmldump.py	Thu May 27 16:55:22 2021 +0300
@@ -43,8 +43,8 @@
 pkk_mode_defaults = {
     # Default Ptr URL format strings
     "ptr_fmt": {
-        PKK_MODE_NORMAL: u"<PTR:{href}>{text}</PTR>",
-        PKK_MODE_ANKI: u"<a href='https://kaino.kotus.fi/cgi-bin/kks/karjala.cgi?a={href}'>{text}</a>",
+        PKK_MODE_NORMAL: "<PTR:{href}>{text}</PTR>",
+        PKK_MODE_ANKI: "<a href='https://kaino.kotus.fi/cgi-bin/kks/karjala.cgi?a={href}'>{text}</a>",
     },
 
     "word_item": {
@@ -75,7 +75,6 @@
     },
     "search_list_item": {
         PKK_MODE_NORMAL: "\"{text}\"",
-        PKK_MODE_ANKI: "{text}",
     },
     "search_list_sep": {
         PKK_MODE_NORMAL: ", ",
@@ -110,8 +109,8 @@
     },
 
     "example_item": {
-        PKK_MODE_NORMAL: "{indent}exmp \"{text}\"{geostr}\n",
-        PKK_MODE_ANKI: " ⚫ \"{text}\"{geostr}",
+        PKK_MODE_NORMAL: "{indent}exmp \"{text}\"{geo_list}\n",
+        PKK_MODE_ANKI: " ⚫ \"{text}\"{geo_list}",
     },
     "example_geo_list": {
         PKK_MODE_NORMAL: " ({alist})",
@@ -359,7 +358,7 @@
 
         ostr += pkk_get_fmt("example_item").format(
             text=pkk_node_to_text(wnode.find("./Example")),
-            geostr=pkk_get_list_str(geolist, "example_geo", False),
+            geo_list=pkk_get_list_str(geolist, "example_geo", False),
             indent=pkk_geti(indent + 1))
 
     return ostr