X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/fe6b70b78cf3fbd333fe6ee2bbb5c4cb55dacf0b..945af7d4fcb8195b5ee88a37c109cebc7ad1b210:/tasklib/backends.py?ds=inline

diff --git a/tasklib/backends.py b/tasklib/backends.py
index fbe3ba3..6e7d918 100644
--- a/tasklib/backends.py
+++ b/tasklib/backends.py
@@ -7,9 +7,8 @@ import os
 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
 
@@ -76,7 +75,7 @@ class Backend(object):
         Converts TW syntax datetime string to a localized datetime
         object. This method is not mandatory.
         """
-        raise NotImplemented
+        raise NotImplementedError
 
 
 class TaskWarriorException(Exception):
@@ -105,7 +104,7 @@ class TaskWarrior(Backend):
 
         self._config = None
         self.version = self._get_version()
-        self.config = {
+        self.overrides = {
             'confirmation': 'no',
             'dependency.confirmation': 'no',  # See TW-1483 or taskrc man page
             'recurrence.confirmation': 'no',  # Necessary for modifying R tasks
@@ -123,15 +122,15 @@ class TaskWarrior(Backend):
             data_location = os.path.expanduser(data_location)
             if create and not os.path.exists(data_location):
                 os.makedirs(data_location)
-            self.config['data.location'] = data_location
+            self.overrides['data.location'] = data_location
 
         self.tasks = TaskQuerySet(self)
 
     def _get_command_args(self, args, config_override=None):
         command_args = ['task', 'rc:{0}'.format(self.taskrc_location)]
-        config = self.config.copy()
-        config.update(config_override or dict())
-        for item in config.items():
+        overrides = self.overrides.copy()
+        overrides.update(config_override or dict())
+        for item in overrides.items():
             command_args.append('rc.{0}={1}'.format(*item))
         command_args.extend(map(six.text_type, args))
         return command_args
@@ -234,7 +233,7 @@ class TaskWarrior(Backend):
     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(
@@ -251,9 +250,9 @@ class TaskWarrior(Backend):
                 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):
@@ -299,7 +298,7 @@ class TaskWarrior(Backend):
 
     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:
@@ -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
-            # 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))
 
@@ -393,7 +394,7 @@ class TaskWarrior(Backend):
             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