travis: Update tested versions

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

diff --git a/tasklib/backends.py b/tasklib/backends.py
index fbe3ba336e53b50f92a08874c0d1a9b9cec5e7c9..25193cc0fec7b70181feea79dc7a9dfc496ed7d2 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
 


@@ -105,7 +104,7 @@ class TaskWarrior(Backend):
 
         self._config = None
         self.version = self._get_version()
 
         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
             '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)
             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)]
 
         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
             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:
     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):