From: Bazzan Don <donbazzan@gmail.com>
Date: Tue, 25 Oct 2022 21:04:37 +0000 (+0100)
Subject: doc/optimization: move "convert.py" to Python3
X-Git-Tag: suricata-7.0.0-rc2~277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38b3fffbc7fadfc4c097c5b94ea07d88da6b18d6;p=thirdparty%2Fsuricata.git

doc/optimization: move "convert.py" to Python3

Ticket: #5596
---

diff --git a/doc/userguide/convert.py b/doc/userguide/convert.py
index 680d5f4e36..2179df141f 100755
--- a/doc/userguide/convert.py
+++ b/doc/userguide/convert.py
@@ -1,18 +1,18 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import sys
 import re
-import urlparse
 import os.path
-import urllib2
-from StringIO import StringIO
+import urllib.request, urllib.parse
+from io import StringIO
 
 import requests
 
+
 def fetch_images(url, dest):
 
     print("Parsing image URLs from %s." % (url))
-    urlparts = urlparse.urlparse(url)
+    urlparts = urllib.parse.urlparse(url)
     r = requests.get(url)
     for m in re.finditer(r"(/attachments/[^\s]+\.png)\"", r.text):
         filename = os.path.basename(m.group(1))
@@ -29,7 +29,8 @@ def fetch_images(url, dest):
         print("Fetching image %s." % (image_url))
 
         open(os.path.join(dest, filename), "w").write(
-            urllib2.urlopen(image_url).read())
+            urllib.request.urlopen(image_url).read())
+
 
 def main():
 
@@ -88,7 +89,8 @@ def main():
             # _italic_ -> *italic*
             line = re.sub(r"\s_(\w+)_\s", r" *\1* ", line)
 
-            fileobj.write(line.encode("utf-8"))
+            fileobj.write(line)
+
 
 if __name__ == "__main__":
     sys.exit(main())