diff options
author | Steven Knight <knight@baldmt.com> | 2010-04-06 00:11:35 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2010-04-06 00:11:35 (GMT) |
commit | ed03c2ac905426ed875be1ea3ef3b70d6e893fe0 (patch) | |
tree | 14de7a5e09005c19eb44860cbc8697a00c3e194f /src | |
parent | cecfaa2e2679b340ba45af9ad25ac1d4e87f91af (diff) | |
download | SCons-ed03c2ac905426ed875be1ea3ef3b70d6e893fe0.zip SCons-ed03c2ac905426ed875be1ea3ef3b70d6e893fe0.tar.gz SCons-ed03c2ac905426ed875be1ea3ef3b70d6e893fe0.tar.bz2 |
Issue 2331: use cPickle in preference to the pickle module.
Diffstat (limited to 'src')
-rw-r--r-- | src/engine/SCons/Tool/msvs.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index c5e93ac..684ca45 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -35,10 +35,10 @@ from __future__ import generators ### KEEP FOR COMPATIBILITY FIXERS __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import base64 +import cPickle import hashlib import ntpath import os -import pickle import re import sys @@ -426,10 +426,10 @@ class _GenerateV6DSP(_DSPGenerator): if self.nokeep == 0: # now we pickle some data and add it to the file -- MSDEV will ignore it. - pdata = pickle.dumps(self.configs,1) + pdata = cPickle.dumps(self.configs,1) pdata = base64.encodestring(pdata) self.file.write(pdata + '\n') - pdata = pickle.dumps(self.sources,1) + pdata = cPickle.dumps(self.sources,1) pdata = base64.encodestring(pdata) self.file.write(pdata + '\n') @@ -487,7 +487,7 @@ class _GenerateV6DSP(_DSPGenerator): # OK, we've found our little pickled cache of data. try: datas = base64.decodestring(datas) - data = pickle.loads(datas) + data = cPickle.loads(datas) except KeyboardInterrupt: raise except: @@ -506,7 +506,7 @@ class _GenerateV6DSP(_DSPGenerator): # it has a "# " in front of it, so we strip that. try: datas = base64.decodestring(datas) - data = pickle.loads(datas) + data = cPickle.loads(datas) except KeyboardInterrupt: raise except: @@ -688,10 +688,10 @@ class _GenerateV7DSP(_DSPGenerator): if self.nokeep == 0: # now we pickle some data and add it to the file -- MSDEV will ignore it. - pdata = pickle.dumps(self.configs,1) + pdata = cPickle.dumps(self.configs,1) pdata = base64.encodestring(pdata) self.file.write('<!-- SCons Data:\n' + pdata + '\n') - pdata = pickle.dumps(self.sources,1) + pdata = cPickle.dumps(self.sources,1) pdata = base64.encodestring(pdata) self.file.write(pdata + '-->\n') @@ -792,7 +792,7 @@ class _GenerateV7DSP(_DSPGenerator): # OK, we've found our little pickled cache of data. try: datas = base64.decodestring(datas) - data = pickle.loads(datas) + data = cPickle.loads(datas) except KeyboardInterrupt: raise except: @@ -810,7 +810,7 @@ class _GenerateV7DSP(_DSPGenerator): # OK, we've found our little pickled cache of data. try: datas = base64.decodestring(datas) - data = pickle.loads(datas) + data = cPickle.loads(datas) except KeyboardInterrupt: raise except: @@ -937,7 +937,7 @@ class _GenerateV7DSW(_DSWGenerator): # OK, we've found our little pickled cache of data. try: datas = base64.decodestring(datas) - data = pickle.loads(datas) + data = cPickle.loads(datas) except KeyboardInterrupt: raise except: @@ -1042,7 +1042,7 @@ class _GenerateV7DSW(_DSWGenerator): '\tEndGlobalSection\n') self.file.write('EndGlobal\n') if self.nokeep == 0: - pdata = pickle.dumps(self.configs,1) + pdata = cPickle.dumps(self.configs,1) pdata = base64.encodestring(pdata) self.file.write(pdata + '\n') |