Provide `mock` and `shutil.get_terminal_size` for testing on PyPy 3.

README.md

@@ -32,6 +32,16 @@ Simply install with:
                         (not supported for Python 3.2).
 * [prompt-toolkit][6] : For topydo's _prompt_ mode, which offers a shell-like
                         interface with auto-completion.
+* [arrow][8]          : Used to turn dates into a human readable version.
+* [backports.shutil_get_terminal_size][9] : Used to determine your terminal
+                                            window size. This function was
+                                            added to the standard library in
+                                            Python 3.3 and so is only
+                                            required in older versions of
+                                            Python.
+* [python-dateutil][10]: A dependency of *arrow*.
+* [mock][11]          : Used for testing. This was added to the standard
+                        library in Python 3.3.
 
 Demo
 ----
@@ -46,3 +56,7 @@ Demo
 [5]: https://raw.githubusercontent.com/bram85/topydo/master/doc/topydo.gif
 [6]: https://github.com/jonathanslenders/python-prompt-toolkit
 [7]: https://github.com/collective/icalendar
+[8]: https://github.com/crsmithdev/arrow
+[9]: https://github.com/chrippa/backports.shutil_get_terminal_size
+[10]: https://dateutil.readthedocs.org/
+[11]: https://github.com/testing-cabal/mock

setup.py

@@ -33,9 +33,11 @@ setup(
     ],
     extras_require = {
         ':sys_platform=="win32"': ['colorama>=0.2.5'],
+        ':python_version=="3.2"': ['backports.shutil_get_terminal_size>=1.0.0'],
         'ical': ['icalendar'],
         'prompt-toolkit': ['prompt-toolkit >= 0.53'],
         'test': ['coverage', 'freezegun', 'green', ],
+        'test:python_version=="3.2"': ['mock'],
     },
     entry_points= {
         'console_scripts': ['topydo = topydo.cli.UILoader:main'],

test/test_list_command.py

@@ -18,13 +18,20 @@ import codecs
 import re
 import unittest
 from collections import namedtuple
-from unittest import mock
 
 from test.command_testcase import CommandTest
 from test.facilities import load_file_to_todolist
 from topydo.commands.ListCommand import ListCommand
 from topydo.lib.Config import config
 
+# We're searching for 'mock'
+# 'mock' was added as 'unittest.mock' in Python 3.3, but PyPy 3 is based on Python 3.2
+# pylint: disable=no-name-in-module
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 
 class ListCommandTest(CommandTest):
     def setUp(self):

topydo/lib/Utils.py

@@ -23,6 +23,12 @@ import re
 from collections import namedtuple
 from datetime import date
 
+# shutil.get_terminal_size was added to the standard library in Python 3.3
+try:
+    from shutil import get_terminal_size as _get_terminal_size  # pylint: disable=no-name-in-module
+except ImportError:
+    from backports.shutil_get_terminal_size import get_terminal_size as _get_terminal_size  # pylint: disable=import-error
+
 
 def date_string_to_date(p_date):
     """
@@ -54,15 +60,14 @@ def escape_ansi(p_string):
 
 escape_ansi.pattern = re.compile(r'\x1b[^m]*m')
 
+
 def get_terminal_size():
     """
     Try to determine terminal size at run time. If that is not possible,
     returns the default size of 80x24.
     """
-    from shutil import get_terminal_size # pylint: disable=no-name-in-module
-
     try:
-        sz = get_terminal_size()
+        sz = _get_terminal_size()
     except ValueError:
         """
         This can result from the 'underlying buffer being detached', which