switch to python 3.10

Author: ivailop

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.0
 jobs:
   build:
     docker:
-      - image: cimg/python:2.7-browsers
+      - image: cimg/python:3.10-browsers
     steps:
       - run: sudo apt update && sudo apt-get install pylint
       - checkout

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/setup-python@v4
         with:
-          python-version: 2.7
+          python-version: "3.10"
       - name: Setup build tools
         run: |
           sudo apt-get install pylint

.gitignore

@@ -1,4 +1,5 @@
 __pycache__
+.venv
 .ropeproject
 *.swp
 *.pyc

README.md

@@ -29,7 +29,7 @@ Publishing **Test Content** using www.testspace.com.
 
 ***
 
-In order to run this sample you will need a host workstation with installed python 2.6+.
+In order to run this sample you will need a host workstation with installed python 3.8+.
 
 
 Download and configure the Testspace client

requirements.txt

@@ -1,6 +1,4 @@
-cov-core
-enum
-mock==2.0.0
+mock
 nose2
-six==1.10.0
-unittest2
+nose2-cov
+six

stock_alerter/tests/test_action.py

@@ -1,6 +1,6 @@
 from __future__ import print_function
 import smtplib
-import unittest2 as unittest
+import unittest
 import mock
 
 from ..action import EmailAction, PrintAction
@@ -28,7 +28,7 @@ def __eq__(self, other):
             self.expected["Message"] == other._payload
 
 
-@mock.patch("__builtin__.print")
+@mock.patch("stock_alerter.action.print")
 class PrintActionTest(unittest.TestCase):
     def test_executing_action_prints_message(self, mock_print):
         action = PrintAction()

stock_alerter/tests/test_legacy.py

@@ -12,7 +12,7 @@ def __init__(self, exchange):
 
 
 class AlertProcessorTest(unittest.TestCase):
-    @mock.patch("__builtin__.print")
+    @mock.patch("stock_alerter.legacy.print")
     def test_processor_characterization_1(self, mock_print):
         AlertProcessor()
         mock_print.assert_has_calls([mock.call("AAPL", 8),
@@ -22,7 +22,7 @@ def test_processor_characterization_1(self, mock_print):
 
     def test_processor_characterization_2(self):
         processor = AlertProcessor(autorun=False)
-        with mock.patch("__builtin__.print") as mock_print:
+        with mock.patch("stock_alerter.legacy.print") as mock_print:
             processor.run()
         mock_print.assert_has_calls([mock.call("AAPL", 8),
                                      mock.call("GOOG", 15),
@@ -72,7 +72,7 @@ def test_processor_characterization_7(self):
         processor.parse_file = mock.Mock()
         processor.parse_file.return_value = [
             ('GOOG', datetime(2014, 2, 11, 14, 12, 22, 130000), 15)]
-        with mock.patch("__builtin__.print") as mock_print:
+        with mock.patch("stock_alerter.legacy.print") as mock_print:
             processor.run()
         mock_print.assert_called_with("GOOG", 15)
 
@@ -81,7 +81,7 @@ def test_processor_characterization_8(self):
         processor.parse_file = mock.Mock()
         processor.parse_file.return_value = [
             ('GOOG', datetime(2014, 2, 11, 14, 10, 22, 130000), 5)]
-        with mock.patch("__builtin__.print") as mock_print:
+        with mock.patch("stock_alerter.legacy.print") as mock_print:
             processor.run()
         self.assertFalse(mock_print.called)
 

stock_alerter/tests/test_reader.py

@@ -17,7 +17,7 @@ def get_update(data):
 class FileReaderTest(unittest.TestCase):
     def test_FileReader_opens_the_given_file(self):
         mock_open = mock.mock_open(read_data="")
-        with mock.patch("__builtin__.open", mock_open, create=True):
+        with mock.patch("stock_alerter.reader.open", mock_open, create=True):
             reader = FileReader("stocks.txt")
             updater = reader.get_updates()
             self.get_update(updater)
@@ -30,7 +30,7 @@ def get_update(data):
         except StopIteration:
             pass
 
-    @mock.patch("__builtin__.open",
+    @mock.patch("stock_alerter.reader.open",
                 mock.mock_open(read_data="""\
 GOOG,2014-02-11T14:10:22.13,10"""))
     def test_FileReader_returns_the_file_contents(self):
@@ -41,7 +41,7 @@ def test_FileReader_returns_the_file_contents(self):
                           datetime(2014, 2, 11, 14, 10, 22, 130000),
                           10), update)
 
-    @mock.patch("__builtin__.open",
+    @mock.patch("stock_alerter.reader.open",
                 mock.mock_open(read_data="""\
 GOOG,2014-02-11T14:10:22.13,10
 MSFT,2014-02-11T00:00:00.0,8"""))

stock_alerter/tests/test_stock.py

@@ -1,9 +1,14 @@
-import unittest2 as unittest
+import unittest
 import collections
 from datetime import datetime, timedelta
 
 from ..stock import Stock, StockSignal
 
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
+
 
 class StockTest(unittest.TestCase):
     def setUp(self):
@@ -55,14 +60,14 @@ def setUp(self):
 
     def _flatten(self, timestamps):
         for timestamp in timestamps:
-            if not isinstance(timestamp, collections.Iterable):
+            if not isinstance(timestamp, Iterable):
                 yield timestamp
             else:
                 for value in self._flatten(timestamp):
                     yield value
 
     def _generate_timestamp_for_date(self, date, price_list):
-        if not isinstance(price_list, collections.Iterable):
+        if not isinstance(price_list, Iterable):
             return date
         else:
             delta = 1.0/len(price_list)