From 546baa3668406617f31b887d2eec131273f5c4de Mon Sep 17 00:00:00 2001
From: Elliott Pardee <me@vypr.xyz>
Date: Fri, 24 Aug 2018 05:37:47 -0400
Subject: [PATCH] Unescape HTML characters.

---
 .idea/workspace.xml      | 116 ++++++++++++++++++---------------------
 goarch_api/client.py     |   2 +-
 goarch_api/lectionary.py |   3 +-
 setup.py                 |   2 +-
 4 files changed, 58 insertions(+), 65 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 28d1c1f..c60cd8f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c8edefbc-71df-41a9-9878-b830c52cd7b5" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <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/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/models.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$/goarch_api/lectionary.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/lectionary.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" />
@@ -47,7 +45,7 @@
           <entry key="dummy" value="14" />
           <entry key="gitignore" value="1" />
           <entry key="md" value="690" />
-          <entry key="py" value="11660" />
+          <entry key="py" value="11683" />
           <entry key="txt" value="122" />
         </counts>
       </usages-collector>
@@ -55,7 +53,7 @@
         <counts>
           <entry key="Markdown" value="690" />
           <entry key="PLAIN_TEXT" value="137" />
-          <entry key="Python" value="11722" />
+          <entry key="Python" value="11745" />
         </counts>
       </usages-collector>
     </session>
@@ -77,7 +75,7 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/setup.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="92">
@@ -116,8 +114,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="1535101609012" expanded="true" signature="46:47" ph="..." />
-                <marker date="1535101609012" expanded="true" signature="46:51" ph="..." />
+                <marker date="1535103427035" expanded="true" signature="46:47" ph="..." />
+                <marker date="1535103427035" expanded="true" signature="46:51" ph="..." />
               </folding>
             </state>
           </provider>
@@ -140,20 +138,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/goarch_api/models.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="197">
-              <caret line="52" column="25" lean-forward="true" selection-start-line="52" selection-start-column="25" selection-end-line="52" selection-end-column="25" />
+            <state relative-caret-position="111">
+              <caret line="49" column="6" selection-start-line="49" selection-start-column="6" selection-end-line="49" selection-end-column="6" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="161">
-              <caret line="52" column="85" selection-start-line="52" selection-start-column="85" selection-end-line="52" selection-end-column="85" />
-              <folding>
-                <element signature="e#0#9#0" expanded="true" />
-              </folding>
+            <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>
@@ -161,11 +156,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="1472">
-              <caret line="69" column="63" selection-start-line="69" selection-start-column="63" selection-end-line="69" selection-end-column="63" />
+            <state relative-caret-position="230">
+              <caret line="10" column="31" lean-forward="true" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
               <folding>
                 <element signature="e#0#9#0" expanded="true" />
-                <marker date="1535039114263" expanded="true" signature="219:222" ph="..." />
+                <marker date="1535103414986" expanded="true" signature="246:249" ph="..." />
               </folding>
             </state>
           </provider>
@@ -205,12 +200,12 @@
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/LICENSE.txt" />
         <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/goarch_api/lectionary.py" />
         <option value="$PROJECT_DIR$/goarch_api/daily.py" />
-        <option value="$PROJECT_DIR$/goarch_api/client.py" />
-        <option value="$PROJECT_DIR$/setup.py" />
         <option value="$PROJECT_DIR$/goarch_api/models.py" />
         <option value="$PROJECT_DIR$/goarch_api/saint.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>
@@ -429,29 +424,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/goarch_api/lectionary.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1472">
-          <caret line="69" column="63" selection-start-line="69" selection-start-column="63" selection-end-line="69" selection-end-column="63" />
-          <folding>
-            <element signature="e#0#9#0" expanded="true" />
-            <marker date="1535039114263" expanded="true" signature="219:222" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/goarch_api/client.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="36">
-          <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="1535101609012" expanded="true" signature="46:47" ph="..." />
-            <marker date="1535101609012" expanded="true" signature="46:51" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/goarch_api/daily.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="174">
@@ -464,6 +436,43 @@
         </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$/goarch_api/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="111">
+          <caret line="49" column="6" selection-start-line="49" selection-start-column="6" selection-end-line="49" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/goarch_api/lectionary.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="10" column="31" lean-forward="true" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
+          <folding>
+            <element signature="e#0#9#0" expanded="true" />
+            <marker date="1535103414986" expanded="true" signature="246:249" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/goarch_api/client.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="36">
+          <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="1535103427035" expanded="true" signature="46:47" ph="..." />
+            <marker date="1535103427035" expanded="true" signature="46:51" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/setup.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="92">
@@ -471,22 +480,5 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/goarch_api/models.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="52" column="25" lean-forward="true" selection-start-line="52" selection-start-column="25" selection-end-line="52" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/goarch_api/saint.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="52" column="85" selection-start-line="52" selection-start-column="85" selection-end-line="52" selection-end-column="85" />
-          <folding>
-            <element signature="e#0#9#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/goarch_api/client.py b/goarch_api/client.py
index a0e5cc5..cf217ed 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.5), Python/'
+        user_agent = 'goarch_api (https://github.com/Oikonomia/goarch_api 1.0.6), 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/lectionary.py b/goarch_api/lectionary.py
index e776940..8f4f3ae 100644
--- a/goarch_api/lectionary.py
+++ b/goarch_api/lectionary.py
@@ -1,4 +1,5 @@
 import re
+import html
 
 from lxml import etree
 
@@ -8,7 +9,7 @@ from goarch_api.models import Translation, Icon
 
 def remove_html_tags(raw):
     regex = re.compile('<.*?>')
-    return re.sub(regex, " ", raw)
+    return html.unescape(re.sub(regex, " ", raw))
 
 
 class Lectionary:
diff --git a/setup.py b/setup.py
index 4356f1c..b82272e 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="goarch_api",
-    version="1.0.5",
+    version="1.0.6",
     author="Elliott Pardee",
     author_email="me@vypr.xyz",
     url="https://github.com/Oikonomia/goarch_api",