Add test for recurring task import error

[etc/taskwarrior.git] / tasklib / backends.py

diff --git a/tasklib/backends.py b/tasklib/backends.py
index b2038be70624d254c2d64a4347c8b20b04f42254..6e7d91815180d0f357bc3759ff867c6da7056615 100644 (file)
--- a/tasklib/backends.py
+++ b/tasklib/backends.py
@@ -7,9 +7,8 @@ import os
 import re
 import six
 import subprocess
 import re
 import six
 import subprocess

-import copy

 
 

-from .task import Task, TaskQuerySet
+from .task import Task, TaskQuerySet, ReadOnlyDictView

 from .filters import TaskWarriorFilter
 from .serializing import local_zone
 
 from .filters import TaskWarriorFilter
 from .serializing import local_zone
 


@@ -76,7 +75,7 @@ class Backend(object):
         Converts TW syntax datetime string to a localized datetime
         object. This method is not mandatory.
         """
         Converts TW syntax datetime string to a localized datetime
         object. This method is not mandatory.
         """

-        raise NotImplemented
+        raise NotImplementedError

 
 
 class TaskWarriorException(Exception):
 
 
 class TaskWarriorException(Exception):


@@ -234,7 +233,7 @@ class TaskWarrior(Backend):
     def config(self):
         # First, check if memoized information is available
         if self._config:
     def config(self):
         # First, check if memoized information is available
         if self._config:

-            return copy.deepcopy(self._config)
+            return self._config

 
         # If not, fetch the config using the 'show' command
         raw_output = self.execute_command(
 
         # If not, fetch the config using the 'show' command
         raw_output = self.execute_command(


@@ -251,9 +250,9 @@ class TaskWarrior(Backend):
                 config[match.group('key')] = match.group('value').strip()
 
         # Memoize the config dict
                 config[match.group('key')] = match.group('value').strip()
 
         # Memoize the config dict

-        self._config = config
+        self._config = ReadOnlyDictView(config)

 
 

-        return copy.deepcopy(config)
+        return self._config

 
     def execute_command(self, args, config_override=None, allow_failure=True,
                         return_all=False):
 
     def execute_command(self, args, config_override=None, allow_failure=True,
                         return_all=False):


@@ -299,7 +298,7 @@ class TaskWarrior(Backend):
 
     def filter_tasks(self, filter_obj):
         self.enforce_recurrence()
 
     def filter_tasks(self, filter_obj):
         self.enforce_recurrence()

-        args = ['export', '--'] + filter_obj.get_filter_params()
+        args = ['export'] + filter_obj.get_filter_params()

         tasks = []
         for line in self.execute_command(args):
             if line:
         tasks = []
         for line in self.execute_command(args):
             if line:


@@ -324,8 +323,10 @@ class TaskWarrior(Backend):
             id_lines = [l for l in output if l.startswith('Created task ')]
 
             # Complain loudly if it seems that more tasks were created
             id_lines = [l for l in output if l.startswith('Created task ')]
 
             # Complain loudly if it seems that more tasks were created

-            # Should not happen
-            if len(id_lines) != 1 or len(id_lines[0].split(' ')) != 3:
+            # Should not happen.
+            # Expected output: Created task 1.
+            #                  Created task 1 (recurrence template).
+            if len(id_lines) != 1 or len(id_lines[0].split(' ')) not in (3, 5):

                 raise TaskWarriorException("Unexpected output when creating "
                                            "task: %s" % '\n'.join(id_lines))
 
                 raise TaskWarriorException("Unexpected output when creating "
                                            "task: %s" % '\n'.join(id_lines))
 


@@ -393,7 +394,7 @@ class TaskWarrior(Backend):
             for key, value in data.items():
                 taskfilter.add_filter_param(key, value)
 
             for key, value in data.items():
                 taskfilter.add_filter_param(key, value)
 

-            output = self.execute_command(['export', '--'] +
+            output = self.execute_command(['export'] +

                                           taskfilter.get_filter_params())
 
         # If more than 1 task has been matched still, raise an exception
                                           taskfilter.get_filter_params())
 
         # If more than 1 task has been matched still, raise an exception