mirror of https://github.com/python/cpython.git
Error message goes to stderr
canceled() takes an optional flag so that the canceled flag can be cleared.
This commit is contained in:
parent
d9e5214c26
commit
4ab5ae2ad0
|
@ -12,6 +12,7 @@
|
|||
since this would cause it to get updated twice.
|
||||
"""
|
||||
|
||||
import sys
|
||||
from types import DictType
|
||||
import marshal
|
||||
|
||||
|
@ -33,7 +34,9 @@ def __init__(self, colordb, initfile):
|
|||
fp = open(initfile)
|
||||
self.__optiondb = marshal.load(fp)
|
||||
if type(self.__optiondb) <> DictType:
|
||||
print 'Problem reading options from file:', initfile
|
||||
sys.stderr.write(
|
||||
'Problem reading options from file: %s\n' %
|
||||
initfile)
|
||||
self.__optiondb = {}
|
||||
except (IOError, EOFError):
|
||||
pass
|
||||
|
@ -76,7 +79,8 @@ def save_views(self):
|
|||
try:
|
||||
fp = open(self.__initfile, 'w')
|
||||
except IOError:
|
||||
print 'Cannot write options to file:', file
|
||||
sys.stderr.write('Cannot write options to file: %s\n' %
|
||||
self.__initfile)
|
||||
else:
|
||||
marshal.dump(self.__optiondb, fp)
|
||||
finally:
|
||||
|
@ -88,8 +92,8 @@ def withdraw_views(self):
|
|||
if hasattr(v, 'withdraw'):
|
||||
v.withdraw()
|
||||
|
||||
def canceled(self):
|
||||
self.__canceled = 1
|
||||
def canceled(self, flag=1):
|
||||
self.__canceled = flag
|
||||
|
||||
def canceled_p(self):
|
||||
return self.__canceled
|
||||
|
|
Loading…
Reference in New Issue