Fixed xml declaration (updated to python 3.7.9 elementTree API)

+ Update to v3.0.2 + Fixed xml declaration (updated to python 3.7.9 elementTree API) + Updated Python platform to Python 3.7.9
malakhovks · Oct 16, 2020 · fa55582 · fa55582
1 parent 91c97fd
commit fa55582
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## v3.0.2, 2020-10-16
+
+### 👍 Покращення
+
+- Оновлено платформу `Python` до версії  `Python 3.7.9`.
+
+### 🔴 Виправлення помилок
+
+- Дрібні виправлення.
+
 ## v3.0.1, 2020-10-16
 
 ### 🏭 Нові можливості

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.7.7-slim-stretch
+FROM python:3.7.9-slim-stretch
+# FROM python:3.7.7-slim-stretch
 # FROM python:2.7-slim-stretch
 
 # https://linuxhint.com/install_wine_debian_10/

diff --git a/templates/en.html b/templates/en.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>Konspekt - v3.0.1</title>
+  <title>Konspekt - v3.0.2</title>
   <meta charset="UTF-8">
   <link rel="shortcut icon" type="image/png" href="./static/images/favicon.png" />
   <link rel="stylesheet" type="text/css" href="./static/bootstrap/css/flatly.bootstrap.css" media="screen" />

diff --git a/templates/index.html b/templates/index.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>Konspekt - v3.0.1</title>
+  <title>Konspekt - v3.0.2</title>
   <meta charset="UTF-8">
   <link rel="shortcut icon" type="image/png" href="./static/images/favicon.png" />
   <link rel="stylesheet" type="text/css" href="./static/bootstrap/css/flatly.bootstrap.css" media="screen" />
@@ -15,7 +15,7 @@
     <canvas id="canvas-interactive"></canvas>
     <div class="cta-wrapper">
       <h1 style="color: black;">КОНСПЕКТ</h1>
-      <h5>v3.0.1</h5>
+      <h5>v3.0.2</h5>
       <h2 style="color: black; width: 800px;">Контекстно-семантичний аналіз природно-мовних текстів та побудова таксономії документів</h2>
       <a href="/ua" id="violet-state-cta" class="hvr-grow-shadow">Українська</a>
       <a href="/en" id="orange-state-cta" class="hvr-grow-shadow">English</a>

diff --git a/templates/ua.html b/templates/ua.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>Конспект - v3.0.1</title>
+  <title>Конспект - v3.0.2</title>
   <meta charset="UTF-8">
   <link rel="shortcut icon" type="image/png" href="./static/images/favicon.png" />
   <link rel="stylesheet" type="text/css" href="./static/bootstrap/css/flatly.bootstrap.css" media="screen" />

diff --git a/terms_comparator.py b/terms_comparator.py
@@ -145,7 +145,8 @@ def __make_xml_nodedata__(self, allterms_xml, key_words, input_terms_path, outpu
                                         new_element.text = sent
         # TODO Encoding variations
         try:
-            return ET.tostring(e, encoding='unicode', method="xml", xml_declaration=True)
+            # return ET.tostring(e, encoding='unicode', method="xml", xml_declaration=True)
+            return ET.tostring(e, encoding='utf-8', method="xml", xml_declaration=True)
         except Exception as e:
             return logging.error(e, exc_info=True)
         # outFile = open(output_structure_path, 'w+', encoding='utf-8')