From 0d5d5ce535a4847aa987f7adf46ba205a75fa591 Mon Sep 17 00:00:00 2001
From: Gregory Soutade <gregory@soutade.fr>
Date: Sun, 18 Sep 2022 17:22:17 +0200
Subject: [PATCH] Fix errors with Python3

---
 dynastie/generators/markdown2.py | 6 +++---
 dynastie/models.py               | 8 ++++++--
 dynastie/search.py               | 5 ++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dynastie/generators/markdown2.py b/dynastie/generators/markdown2.py
index 5813da7..c8ec119 100755
--- a/dynastie/generators/markdown2.py
+++ b/dynastie/generators/markdown2.py
@@ -102,7 +102,7 @@ except ImportError:
 import optparse
 from random import random, randint
 import codecs
-
+import urllib.parse
 
 # ---- Python version compat
 
@@ -1273,7 +1273,7 @@ class Markdown(object):
                         if is_inline_img:
                             img_class_str = ' class="inlineimage"'
                         result = '<img src="%s" alt="%s"%s%s%s' \
-                                 % (url.replace('"', '&quot;'),
+                                 % (urllib.parse.quote(url),
                                     _xml_escape_attr(link_text),
                                     title_str, img_class_str, self.empty_element_suffix)
                         if "smarty-pants" in self.extras:
@@ -1323,7 +1323,7 @@ class Markdown(object):
                         if is_img:
                             img_class_str = self._html_class_str_from_tag("img")
                             result = '<img src="%s" alt="%s"%s%s%s' \
-                                % (url.replace('"', '&quot;'),
+                                % (urllib.parse.quote(url),
                                    link_text.replace('"', '&quot;'),
                                    title_str, img_class_str, self.empty_element_suffix)
                             if "smarty-pants" in self.extras:
diff --git a/dynastie/models.py b/dynastie/models.py
index dc4af0f..6562957 100755
--- a/dynastie/models.py
+++ b/dynastie/models.py
@@ -116,7 +116,7 @@ class Blog(models.Model):
                 if os.path.isdir(srcname):
                     if not os.path.exists(dstname):
                         os.makedirs(dstname)
-                        self.copytree(srcname, dstname, ignore=True)
+                        shutil.copytree(srcname, dstname, ignore=True)
                     else:
                         return self.copytree(srcname, dstname)
                 else:
@@ -187,7 +187,11 @@ class Blog(models.Model):
                     if obj.__module__ in generated: continue
                     e = obj(hash_posts, hash_posts_content)
                     print('Go for {}'.format(e))
-                    r = e.generate(self, self.src_path, self.output_path)
+                    try:
+                        r = e.generate(self, self.src_path, self.output_path)
+                    except Exception as err:
+                        self.report += err
+                        continue
                     generated.append(obj.__module__)
                     if not r is None:
                         self.report = self.report + '<br/>\n' + r
diff --git a/dynastie/search.py b/dynastie/search.py
index ee1f46d..74804b9 100755
--- a/dynastie/search.py
+++ b/dynastie/search.py
@@ -192,7 +192,7 @@ class Search:
     def search(self, blog, string):
         hashtable = self._loadDatabase(blog)
         
-        string = self._prepare_string(string.encode('utf-8'))
+        string = self._prepare_string(string)
 
         wordlist = string.split(' ')
 
@@ -207,8 +207,7 @@ class Search:
                     for post in hashtable[key]:
                         res[post[0]] = res.get(post[0],0) + post[1]
 
-        sorted_res = sorted(res.iteritems(), key=operator.itemgetter(1))
-        sorted_res.reverse()
+        sorted_res = sorted(res.items(), key=operator.itemgetter(1), reverse=True)
 
         res = [sorted_res[i][0] for i in range(len(sorted_res))]