Python 3 Support

geeknote now works on Python 3 with evernote3 package.

Python 2 to 3 conversion applied. Fixed str/bytes encoding/decoding issues.

Author: alperenkose

geeknote/argparser.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from log import logging
-import out
+from .log import logging
+from . import out
 
 
 COMMANDS_DICT = {
@@ -442,7 +442,7 @@ def __init__(self, sys_argv):
         self.INPUT = sys_argv
 
         # list of commands
-        self.CMD_LIST = self.COMMANDS.keys()
+        self.CMD_LIST = list(self.COMMANDS.keys())
         # command
         self.CMD = None if self.LVL == 0 else self.INPUT[0]
         # list of possible arguments of the command line
@@ -497,7 +497,7 @@ def parse(self):
             return False
 
         # prepare data
-        for arg, params in self.CMD_ARGS.items() + self.CMD_FLAGS.items():
+        for arg, params in list(self.CMD_ARGS.items()) + list(self.CMD_FLAGS.items()):
             # set values by default
             if "default" in params:
                 self.INP_DATA[arg] = params["default"]
@@ -514,7 +514,7 @@ def parse(self):
             if len(self.INP) > 0:
                 # Check that first argument is a default argument
                 # and another argument.
-                if self.INP[0] not in (self.CMD_ARGS.keys() + self.CMD_FLAGS.keys()):
+                if self.INP[0] not in (list(self.CMD_ARGS.keys()) + list(self.CMD_FLAGS.keys())):
                     self.INP = [firstArg] + self.INP
             else:
                 self.INP = [firstArg]
@@ -592,23 +592,23 @@ def parse(self):
                 return False
 
         # check whether there is a necessary argument request
-        for arg, params in self.CMD_ARGS.items() + self.CMD_FLAGS.items():
+        for arg, params in list(self.CMD_ARGS.items()) + list(self.CMD_FLAGS.items()):
             if "required" in params and arg not in self.INP:
                 self.printErrorReqArgument(arg)
                 return False
 
         # trim -- and ->_
         self.INP_DATA = dict(
             [key.lstrip("-").replace("-", "_"), val]
-            for key, val in self.INP_DATA.items()
+            for key, val in list(self.INP_DATA.items())
         )
         return self.INP_DATA
 
     def printAutocomplete(self):
         # checking later values
         LAST_VAL = self.INP[-1] if self.LVL > 1 else None
         PREV_LAST_VAL = self.INP[-2] if self.LVL > 2 else None
-        ARGS_FLAGS_LIST = self.CMD_ARGS.keys() + self.CMD_FLAGS.keys()
+        ARGS_FLAGS_LIST = list(self.CMD_ARGS.keys()) + list(self.CMD_FLAGS.keys())
 
         # print root grid
         if self.CMD is None:
@@ -649,7 +649,7 @@ def printAutocomplete(self):
 
             # processing of the arguments
             else:
-                print ""  # "Please_input_%s" % INP_ARG.replace('-', '')
+                print("")  # "Please_input_%s" % INP_ARG.replace('-', '')
 
     def printGrid(self, list):
         out.printLine(" ".join(list))
@@ -678,7 +678,7 @@ def printErrorArgument(self, errorArg, errorVal=None):
 
     def printHelp(self):
         if self.CMD is None or self.CMD not in self.COMMANDS:
-            tab = len(max(self.COMMANDS.keys(), key=len))
+            tab = len(max(list(self.COMMANDS.keys()), key=len))
             out.printLine("Available commands:")
             for cmd in sorted(self.COMMANDS):
                 out.printLine(
@@ -687,7 +687,7 @@ def printHelp(self):
 
         else:
 
-            tab = len(max(self.CMD_ARGS.keys() + self.CMD_FLAGS.keys(), key=len))
+            tab = len(max(list(self.CMD_ARGS.keys()) + list(self.CMD_FLAGS.keys()), key=len))
 
             out.printLine("Options for: %s" % self.CMD)
             out.printLine("Available arguments:")

geeknote/config.py

@@ -89,7 +89,7 @@
 try:
     if not os.path.exists(APP_DIR):
         os.mkdir(APP_DIR)
-except Exception, e:
+except Exception as e:
     sys.stdout.write("Cannot create application directory : %s" % APP_DIR)
     exit(1)
 

geeknote/editor.py

@@ -8,12 +8,12 @@
 import hashlib
 import html2text as html2text
 import markdown2 as markdown
-import tools
-import out
+from . import tools
+from . import out
 import re
-import config
-from storage import Storage
-from log import logging
+from . import config
+from .storage import Storage
+from .log import logging
 from xml.sax.saxutils import escape, unescape
 
 
@@ -35,7 +35,7 @@ def getHtmlEscapeTable():
 
     @staticmethod
     def getHtmlUnescapeTable():
-        return dict((v, k) for k, v in Editor.getHtmlEscapeTable().items())
+        return dict((v, k) for k, v in list(Editor.getHtmlEscapeTable().items()))
 
     @staticmethod
     def HTMLEscape(text):
@@ -55,7 +55,7 @@ def getImages(contentENML):
         Creates a list of image resources to save.
         Each has a hash and extension attribute.
         """
-        soup = BeautifulSoup(contentENML.decode("utf-8"))
+        soup = BeautifulSoup(contentENML)
         imageList = []
         for section in soup.findAll("en-media"):
             if "type" in section.attrs and "hash" in section.attrs:
@@ -84,7 +84,7 @@ def ENMLtoText(
         imageOptions={"saveImages": False},
         imageFilename="",
     ):
-        soup = BeautifulSoup(contentENML.decode("utf-8"), "html.parser")
+        soup = BeautifulSoup(contentENML, "html.parser")
 
         if format == "pre":
             #
@@ -97,7 +97,7 @@ def ENMLtoText(
             if len(sections) >= 1:
                 content = ""
                 for c in sections[0].contents:
-                    content = u"".join((content, c))
+                    content = "".join((content, c))
                 pass
             else:
                 format = "default"
@@ -142,10 +142,10 @@ def ENMLtoText(
             for section in soup.find_all("en-media"):
                 section.replace_with(str(section))
 
-        content = html2text.html2text(str(soup).decode("utf-8"), "")
+        content = html2text.html2text(str(soup), "")
 
         content = re.sub(r" *\n", os.linesep, content)
-        content = content.replace(unichr(160), " ")  # no-break space
+        content = content.replace(chr(160), " ")  # no-break space
         content = Editor.HTMLUnescape(content)
 
         return content.encode("utf-8")
@@ -202,15 +202,14 @@ def textToENML(content, raise_ex=False, format="markdown", rawmd=False):
         if not isinstance(content, str):
             content = ""
         try:
-            content = unicode(content, "utf-8")
             # add 2 space before new line in paragraph for creating br tags
             content = re.sub(r"([^\r\n])([\r\n])([^\r\n])", r"\1  \n\3", content)
             # content = re.sub(r'\r\n', '\n', content)
 
             if format == "pre":
                 # For the 'pre' format, simply wrap the content with a 'pre' tag.
                 # Do not perform any further parsing/mutation.
-                contentHTML = u"".join(("<pre>", content, "</pre>")).encode("utf-8")
+                contentHTML = "".join(("<pre>", content, "</pre>")).encode("utf-8")
             elif format == "markdown":
                 # Markdown format https://daringfireball.net/projects/markdown/basics
                 extras = None
@@ -240,14 +239,9 @@ def textToENML(content, raise_ex=False, format="markdown", rawmd=False):
 
                 for tag in soup.findAll():
                     if hasattr(tag, "attrs"):
-                        map(
-                            lambda x: tag.attrs.pop(x, None),
-                            [
-                                k
-                                for k in tag.attrs.keys()
-                                if k in ATTR_2_REMOVE or k.find("on") == 0
-                            ],
-                        )
+                        for k in list(tag.attrs.keys()):
+                            if k in ATTR_2_REMOVE or k.find("on") == 0:
+                                tag.attrs.pop(k, None)
                 contentHTML = str(soup)
             else:
                 # Plain text format
@@ -256,9 +250,9 @@ def textToENML(content, raise_ex=False, format="markdown", rawmd=False):
                 tmpstr = ""
                 for l in contentHTML.split("\n"):
                     if l == "":
-                        tmpstr = tmpstr + u"<div><br/></div>"
+                        tmpstr = tmpstr + "<div><br/></div>"
                     else:
-                        tmpstr = tmpstr + u"<div>" + l + u"</div>"
+                        tmpstr = tmpstr + "<div>" + l + "</div>"
 
                 contentHTML = tmpstr.encode("utf-8")
                 contentHTML = contentHTML.replace(

geeknote/gclient.py

@@ -75,7 +75,7 @@ def validate(self):
         return
 
     def __repr__(self):
-        L = ["%s=%r" % (key, value) for key, value in self.__dict__.iteritems()]
+        L = ["%s=%r" % (key, value) for key, value in self.__dict__.items()]
         return "%s(%s)" % (self.__class__.__name__, ", ".join(L))
 
     def __eq__(self, other):
@@ -181,7 +181,7 @@ def validate(self):
         return
 
     def __repr__(self):
-        L = ["%s=%r" % (key, value) for key, value in self.__dict__.iteritems()]
+        L = ["%s=%r" % (key, value) for key, value in self.__dict__.items()]
         return "%s(%s)" % (self.__class__.__name__, ", ".join(L))
 
     def __eq__(self, other):