Merge branch 'master' of https://github.com/alperenkose/geeknote3 into 3.0

Author: jeffkowalski

README.md

@@ -149,7 +149,7 @@ obtaining the personal token.
 $ geeknote settings
 Geeknote
 ******************************
-Version: 2.0.21
+Version: 3.0
 App dir: /Users/username/.geeknote
 Error log: /Users/username/.geeknote/error.log
 Current editor: vim

geeknote/__init__.py

@@ -1 +1 @@
-__version__ = "2.0.21"
+__version__ = "3.1"

geeknote/editor.py

@@ -148,7 +148,7 @@ def ENMLtoText(
         content = content.replace(chr(160), " ")  # no-break space
         content = Editor.HTMLUnescape(content)
 
-        return content.encode("utf-8")
+        return content
 
     @staticmethod
     def wrapENML(contentHTML):
@@ -282,7 +282,8 @@ def __init__(self, editor, content, noteExtension, raw=False):
         if not noteExtension:
             noteExtension = config.DEF_NOTE_EXT
         (tempfileHandler, tempfileName) = tempfile.mkstemp(suffix=noteExtension)
-        os.write(tempfileHandler, content if raw else self.ENMLtoText(content))
+        content = content if raw else self.ENMLtoText(content)
+        os.write(tempfileHandler, content.encode('utf-8'))
         os.close(tempfileHandler)
 
         self.content = content

geeknote/geeknote.py

@@ -1003,7 +1003,7 @@ def _editWithEditorInThread(
                 if result:
                     prevChecksum = editor.getTempfileChecksum()
 
-            if not thread.isAlive():
+            if not thread.is_alive():
                 # check if thread is alive here before sleep to avoid losing data saved during this 5 secs
                 break
             thread.join(timeout=5)

geeknote/storage.py

@@ -278,7 +278,7 @@ def getSettings(self):
         settings = self.session.query(Setting).all()
         result = {}
         for item in settings:
-            result[item.key] = item.value
+            result[item.key] = pickle.loads(item.value)
         return result
 
     @logging
@@ -307,7 +307,7 @@ def getSetting(self, key):
         """
         instance = self.session.query(Setting).filter_by(key=key).first()
         if instance:
-            return str(instance.value)
+            return instance.value
         else:
             return None
 

geeknote/tools.py

@@ -83,14 +83,15 @@ def decodeArgs(args):
 
 
 def stdoutEncode(data):
-    try:
-        return data.decode("utf8").encode(sys.stdout.encoding)
-    except:
+    # this is not for logging output, it is for output from geeknote queries to evernote
+    if isinstance(sys.stdout.encoding, str) and sys.stdout.encoding != 'utf-8':
+        return data.encode('utf-8').decode(sys.stdout.encoding)
+    else:
         return data
 
 
 def stdinEncode(data):
-    try:
-        return data.decode(sys.stdin.encoding).encode("utf8")
-    except:
+    if isinstance(sys.stdin.encoding, str) and sys.stdin.encoding.lower() != 'utf-8':
+        return data.encode(sys.stdin.encoding).decode('utf-8')
+    else:
         return data

requirements.txt

@@ -9,4 +9,5 @@ lxml
 
 # Testing requirements
 pytest
+pytest-runner
 mock

setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import sys

tests/test_geeknote.py

@@ -77,6 +77,7 @@ def test_parseInput2(self):
         )
         self.assertEqual(testData["tags"], ["tag1", "tag2"])
 
+    # this doesn't seem to work in Python 3 - need help
     def check_editWithEditorInThread(self, txt, expected):
         testNote = tools.Struct(title="note title",
                                 content=txt)

tests/test_gnsync.py

@@ -40,19 +40,19 @@ def tearDown(self):
             shutil.rmtree(self.test_dir)
 
     def test_strip_eng(self):
-        self.assertEqual(remove_control_characters(self.given_eng.decode('utf-8')).encode('utf-8'),
+        self.assertEqual(remove_control_characters(self.given_eng),
                          self.expected_eng)
 
     def test_strip_kor(self):
-        self.assertEqual(remove_control_characters(self.given_kor.decode('utf-8')).encode('utf-8'),
+        self.assertEqual(remove_control_characters(self.given_kor),
                          self.expected_kor)
 
     def test_strip_chn(self):
-        self.assertEqual(remove_control_characters(self.given_chn.decode('utf-8')).encode('utf-8'),
+        self.assertEqual(remove_control_characters(self.given_chn),
                          self.expected_chn)
 
     def test_strip_nochange(self):
-        self.assertEqual(remove_control_characters(self.given_combined.decode('utf-8')).encode('utf-8'),
+        self.assertEqual(remove_control_characters(self.given_combined),
                          self.expected_combined)
 
     @patch('geeknote.gnsync.logger', autospec=True)
@@ -86,5 +86,5 @@ def mock_note_load(note):
             AnyStringWith("codec can't decode byte")
         )
 
-        with open(self.test_dir + "/Test Note.txt", 'r') as f:
+        with open(self.test_dir + "/Test Note.txt", 'r', encoding='utf-8') as f:
             self.assertIn("œ ž © µ ¶ å õ ý þ ß Ü", f.read())