WIP updating to python 2 to python 3

Author: Pipeline

.vscode/settings.json

@@ -0,0 +1,16 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.background": "#263205",
+        "titleBar.activeBackground": "#354507",
+        "titleBar.activeForeground": "#F6FCE5"
+    },
+    "python.testing.unittestArgs": [
+        "-v",
+        "-s",
+        "./tests",
+        "-p",
+        "*test*.py"
+    ],
+    "python.testing.pytestEnabled": false,
+    "python.testing.unittestEnabled": true
+}

Frames/MobTimerController.py

@@ -2,6 +2,7 @@
 import os
 import uuid
 from tkinter import *
+import sys
 
 from Frames.MinimalScreenBlockerFrame import MinimalScreenBlockerFrame
 from Frames.OuterFrame import OuterFrame

Infrastructure/TipsManager.py

@@ -6,13 +6,13 @@
 
 
 class TipsManager(object):
-    def __init__(self, seed = None, root_directory=sys.argv[0]):
-        self.root_directory = root_directory
+    def __init__(self, seed=None, root_directory=sys.argv[0]):
+        self.root_directory = "/".join(root_directory.split('/')[:-1])
         if seed is not None:
             random.seed(seed)
 
     def get_random_tip(self):
-        tips_folder = self.root_directory+ "/Tips"
+        tips_folder = self.root_directory + "/Tips"
         random_file = random.choice(os.listdir("%s" % tips_folder))
         random_file_path = tips_folder + "\\" + random_file
         return "{}: {}" .format(random_file, TipsManager.random_line(random_file_path))

README.md

@@ -29,3 +29,7 @@ To add a theme simply copy and existing theme. To use that theme, put the file n
 ## Project Links
 [Trello Kanban Board]( https://trello.com/b/THISIB9Q/mob-programming-timer-python)
 
+# Todo
+* Update to latest version of python
+* Convert to single file distributable
+* Create plugin infrastructure

requirements.txt

@@ -1,14 +1,14 @@
-approvaltests==0.1.12
-py2exe==0.9.2.2
-pysmb==1.1.18
-paho-mqtt==1.2
-pyreadline==2.1
-screeninfo==0.2.1
-pypiwin32==219
-dnspython==1.14.0
-Pillow==3.3.1
-Pillow-PIL==0.1.dev0
-pyasn1==0.1.9
-cffi==1.7.0
-pycparser==2.14
-pysha3==0.3
+approvaltests
+py2exe
+pysmb
+paho-mqtt
+pyreadline
+screeninfo
+pypiwin32
+dnspython
+Pillow
+Pillow-PIL
+pyasn1
+cffi
+pycparser
+pysha3

…ountdownManager/TestsCountdownManager.py …ountdownManager/test_CountdownManager.pytests/Infrastructure/CountdownManager/TestsCountdownManager.py renamed to tests/Infrastructure/CountdownManager/test_CountdownManager.py tests/Infrastructure/CountdownManager/TestsCountdownManager.py renamed to tests/Infrastructure/CountdownManager/test_CountdownManager.py

@@ -2,15 +2,12 @@
 import time
 import unittest
 
-from approvaltests import Approvals
-from approvaltests.GenericDiffReporterFactory import GenericDiffReporterFactory
+from approvaltests.approvals import verify
 
 from Infrastructure.CountdownManager import CountdownManager
 
 
-class TestsCountdownManager(unittest.TestCase):
-    def setUp(self):
-        self.reporter = GenericDiffReporterFactory().get_first_working()
+class test_CountdownManager(unittest.TestCase):
 
     def test_set_countdown_timer(self):
         countdown_manager = CountdownManager(None)
@@ -39,7 +36,7 @@ def time_change_callback(days, minutes, seconds):
         countdown_manager.set_countdown_duration(853, 32)
         countdown_manager.set_countdown_duration(3, 62)
 
-        Approvals.verify(result["result"], self.reporter)
+        verify(result["result"])
 
 
 if __name__ == '__main__':