From 358c9bc2d69b99c946cce931abb129cc6c66d91e Mon Sep 17 00:00:00 2001
From: Elliott Pardee <me@vypr.xyz>
Date: Fri, 24 Aug 2018 05:47:53 -0400
Subject: [PATCH] Use proper attributes for xml:lang.

---
 .idea/workspace.xml      | 93 +++++++++++++++++++++++++++-------------
 goarch_api/client.py     |  2 +-
 goarch_api/daily.py      |  2 +-
 goarch_api/lectionary.py |  2 +-
 goarch_api/saint.py      |  4 +-
 setup.py                 |  2 +-
 6 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0df1d96..960b14f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="c8edefbc-71df-41a9-9878-b830c52cd7b5" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/goarch_api/client.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/client.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/goarch_api/daily.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/daily.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/goarch_api/lectionary.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/lectionary.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/goarch_api/saint.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/saint.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -45,7 +47,7 @@
           <entry key="dummy" value="14" />
           <entry key="gitignore" value="1" />
           <entry key="md" value="690" />
-          <entry key="py" value="11785" />
+          <entry key="py" value="11943" />
           <entry key="txt" value="122" />
         </counts>
       </usages-collector>
@@ -53,7 +55,7 @@
         <counts>
           <entry key="Markdown" value="690" />
           <entry key="PLAIN_TEXT" value="137" />
-          <entry key="Python" value="11847" />
+          <entry key="Python" value="12005" />
         </counts>
       </usages-collector>
     </session>
@@ -114,8 +116,8 @@
               <caret line="8" column="79" selection-start-line="8" selection-start-column="79" selection-end-line="8" selection-end-column="79" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
-                <marker date="1535103697226" expanded="true" signature="46:47" ph="..." />
-                <marker date="1535103697226" expanded="true" signature="46:51" ph="..." />
+                <marker date="1535104046164" expanded="true" signature="46:47" ph="..." />
+                <marker date="1535104046164" expanded="true" signature="46:51" ph="..." />
               </folding>
             </state>
           </provider>
@@ -128,8 +130,8 @@
               <caret line="62" column="51" selection-start-line="62" selection-start-column="51" selection-end-line="62" selection-end-column="51" />
               <folding>
                 <element signature="e#0#22#0" expanded="true" />
-                <marker date="1535039127435" expanded="true" signature="165:170" ph="..." />
-                <marker date="1535039127435" expanded="true" signature="200:438" ph="..." />
+                <marker date="1535104025467" expanded="true" signature="165:170" ph="..." />
+                <marker date="1535104025467" expanded="true" signature="200:438" ph="..." />
               </folding>
             </state>
           </provider>
@@ -147,8 +149,11 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/goarch_api/saint.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="138">
-              <caret line="6" column="54" selection-start-line="6" selection-start-column="54" selection-end-line="6" selection-end-column="54" />
+            <state relative-caret-position="-561">
+              <caret line="55" lean-forward="true" selection-start-line="55" selection-end-line="55" />
+              <folding>
+                <element signature="e#0#9#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -156,11 +161,11 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/goarch_api/lectionary.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1163">
-              <caret line="57" lean-forward="true" selection-start-line="57" selection-end-line="57" />
+            <state relative-caret-position="197">
+              <caret line="73" lean-forward="true" selection-start-line="73" selection-end-line="73" />
               <folding>
                 <element signature="e#0#9#0" expanded="true" />
-                <marker date="1535103677328" expanded="true" signature="246:249" ph="..." />
+                <marker date="1535104035875" expanded="true" signature="246:249" ph="..." />
               </folding>
             </state>
           </provider>
@@ -178,7 +183,11 @@
   <component name="FindInProjectRecents">
     <findStrings>
       <find>translation</find>
+      <find>xml:lang</find>
     </findStrings>
+    <replaceStrings>
+      <replace>{http://www.w3.org/XML/1998/namespace}lang</replace>
+    </replaceStrings>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -203,9 +212,9 @@
         <option value="$PROJECT_DIR$/goarch_api/daily.py" />
         <option value="$PROJECT_DIR$/goarch_api/models.py" />
         <option value="$PROJECT_DIR$/goarch_api/saint.py" />
-        <option value="$PROJECT_DIR$/setup.py" />
         <option value="$PROJECT_DIR$/goarch_api/lectionary.py" />
         <option value="$PROJECT_DIR$/goarch_api/client.py" />
+        <option value="$PROJECT_DIR$/setup.py" />
       </list>
     </option>
   </component>
@@ -263,7 +272,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.lectionary">
+  <component name="RunManager" selected="Python.lectionary (1)">
     <configuration name="daily" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="goarch_api" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -285,6 +294,27 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <configuration name="lectionary (1)" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="goarch_api" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/goarch_api" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/goarch_api/lectionary.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
     <configuration name="lectionary" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="goarch_api" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -331,9 +361,11 @@
       <item itemvalue="Python.reading" />
       <item itemvalue="Python.daily" />
       <item itemvalue="Python.lectionary" />
+      <item itemvalue="Python.lectionary (1)" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.lectionary (1)" />
         <item itemvalue="Python.lectionary" />
         <item itemvalue="Python.daily" />
         <item itemvalue="Python.reading" />
@@ -371,7 +403,7 @@
       <window_info id="Favorites" order="2" sideWeight="0.18271606" side_tool="true" weight="0.24980605" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3294702" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32890365" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39900663" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -430,8 +462,8 @@
           <caret line="62" column="51" selection-start-line="62" selection-start-column="51" selection-end-line="62" selection-end-column="51" />
           <folding>
             <element signature="e#0#22#0" expanded="true" />
-            <marker date="1535039127435" expanded="true" signature="165:170" ph="..." />
-            <marker date="1535039127435" expanded="true" signature="200:438" ph="..." />
+            <marker date="1535104025467" expanded="true" signature="165:170" ph="..." />
+            <marker date="1535104025467" expanded="true" signature="200:438" ph="..." />
           </folding>
         </state>
       </provider>
@@ -443,13 +475,23 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/goarch_api/lectionary.py">
+    <entry file="file://$PROJECT_DIR$/goarch_api/saint.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1163">
-          <caret line="57" lean-forward="true" selection-start-line="57" selection-end-line="57" />
+        <state relative-caret-position="-561">
+          <caret line="55" lean-forward="true" selection-start-line="55" selection-end-line="55" />
           <folding>
             <element signature="e#0#9#0" expanded="true" />
-            <marker date="1535103677328" expanded="true" signature="246:249" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/goarch_api/lectionary.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="197">
+          <caret line="73" lean-forward="true" selection-start-line="73" selection-end-line="73" />
+          <folding>
+            <element signature="e#0#9#0" expanded="true" />
+            <marker date="1535104035875" expanded="true" signature="246:249" ph="..." />
           </folding>
         </state>
       </provider>
@@ -460,19 +502,12 @@
           <caret line="8" column="79" selection-start-line="8" selection-start-column="79" selection-end-line="8" selection-end-column="79" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
-            <marker date="1535103697226" expanded="true" signature="46:47" ph="..." />
-            <marker date="1535103697226" expanded="true" signature="46:51" ph="..." />
+            <marker date="1535104046164" expanded="true" signature="46:47" ph="..." />
+            <marker date="1535104046164" expanded="true" signature="46:51" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/goarch_api/saint.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="6" column="54" selection-start-line="6" selection-start-column="54" selection-end-line="6" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/setup.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="92">
diff --git a/goarch_api/client.py b/goarch_api/client.py
index e5c0fd2..473c11a 100644
--- a/goarch_api/client.py
+++ b/goarch_api/client.py
@@ -6,7 +6,7 @@ class HTTPClient:
     def __init__(self):
         self.session = requests.session()
 
-        user_agent = 'goarch_api (https://github.com/Oikonomia/goarch_api 1.0.7), Python/'
+        user_agent = 'goarch_api (https://github.com/Oikonomia/goarch_api 1.0.8), Python/'
         self.user_agent = f"{user_agent}{sys.version_info[0]}.{sys.version_info[1]}"
 
     def request(self, method, path):
diff --git a/goarch_api/daily.py b/goarch_api/daily.py
index 8e19d47..74c2806 100644
--- a/goarch_api/daily.py
+++ b/goarch_api/daily.py
@@ -39,7 +39,7 @@ class Daily:
                 event = reading.find("event").text
 
                 translation = reading.find("translation")
-                t_lang = translation.get("xml:lang")
+                t_lang = translation.get("{http://www.w3.org/XML/1998/namespace}lang")
                 t_title = translation.find("title").text
                 t_short_title = translation.find("shorttitle").text
 
diff --git a/goarch_api/lectionary.py b/goarch_api/lectionary.py
index c5e858b..0655f85 100644
--- a/goarch_api/lectionary.py
+++ b/goarch_api/lectionary.py
@@ -48,7 +48,7 @@ class Lectionary:
             self.translations = []
 
             for translation in tree.findall("translation"):
-                lang = translation.get("xml:lang")
+                lang = translation.get("{http://www.w3.org/XML/1998/namespace}lang")
 
                 if lang != "ar":  # because arabic and the html escape stuff doesn't really work
                     title = translation.find("title").text
diff --git a/goarch_api/saint.py b/goarch_api/saint.py
index bb69702..9244012 100644
--- a/goarch_api/saint.py
+++ b/goarch_api/saint.py
@@ -57,7 +57,7 @@ class Saint:
             self.readings = []
 
             for reading in tree.find("readings").iterchildren():
-                lang = reading.get("xml:lang")
+                lang = reading.get("{http://www.w3.org/XML/1998/namespace}lang")
                 title = reading.find("title").text
                 short_title = reading.find("shorttitle").text
                 body = remove_html_tags(reading.find("body").text).strip()
@@ -77,7 +77,7 @@ class Saint:
                 tone = hymn.find("tone").text
 
                 translation = hymn.find("translation")
-                t_lang = translation.get("xml:lang")
+                t_lang = translation.get("{http://www.w3.org/XML/1998/namespace}lang")
                 t_body = translation.find("body").text
                 t_copyright = translation.find("copyright").text
 
diff --git a/setup.py b/setup.py
index 709ae06..90934f5 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="goarch_api",
-    version="1.0.7",
+    version="1.0.8",
     author="Elliott Pardee",
     author_email="me@vypr.xyz",
     url="https://github.com/Oikonomia/goarch_api",