From 54993543d7f85a2c0d05a8d14ab9b3ec8db91da1 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Sat, 6 Apr 2013 08:28:09 +1100 Subject: [PATCH] Remove the deep copy and use a shallow copy so it worked on Python 2.6. --- source-builder/sb/defaults.py | 2 +- source-builder/sb/reports.py | 4 ++-- source-builder/sb/setbuilder.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source-builder/sb/defaults.py b/source-builder/sb/defaults.py index 4f38e73..939b902 100644 --- a/source-builder/sb/defaults.py +++ b/source-builder/sb/defaults.py @@ -607,7 +607,7 @@ def load(args, optargs = None): command line. """ import copy - d = copy.deepcopy(defaults) + d = copy.copy(defaults) overrides = None if os.name == 'nt': import windows diff --git a/source-builder/sb/reports.py b/source-builder/sb/reports.py index bbb42f4..a3ab4e8 100644 --- a/source-builder/sb/reports.py +++ b/source-builder/sb/reports.py @@ -308,8 +308,8 @@ class report: def buildset(self, name): self.bset_nesting += 1 self.buildset_start(name) - _opts = copy.deepcopy(self.opts) - _defaults = copy.deepcopy(self.defaults) + _opts = copy.copy(self.opts) + _defaults = copy.copy(self.defaults) bset = setbuilder.buildset(name, _configs = self.configs, _defaults = _defaults, diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py index 683edbb..8e2e77d 100644 --- a/source-builder/sb/setbuilder.py +++ b/source-builder/sb/setbuilder.py @@ -283,8 +283,8 @@ class buildset: # defaults so we do not contaminate one configuration with # another. # - _opts = copy.deepcopy(self.opts) - _defaults = copy.deepcopy(self.defaults) + _opts = copy.copy(self.opts) + _defaults = copy.copy(self.defaults) if configs[s].endswith('.bset'): bs = buildset(configs[s], _configs = self.configs,