1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for SF bug #780996, crash when no .pynche file exists and -d

Browse Source 
option is not given.  If dbfile isn't given and can't be retrieved
from the optionsdb, just initialize it to the first element in
RGB_TXT.

Backport candidate.
This commit is contained in:
Barry Warsaw 2003-09-03 03:15:50 +00:00
parent 6f7b213dda
commit eb296d967b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/pynche/Main.py
View File

@ -46,7 +46,7 @@ Where:
initial color, as a color name or #RRGGBB format initial color, as a color name or #RRGGBB format
""" """
__version__ = '1.4' __version__ = '1.4.1'
import sys import sys
import os import os
@ -127,10 +127,12 @@ def build(master=None, initialcolor=None, initfile=None, ignore=None,
# defer to the command line chosen color database, falling back to the one # defer to the command line chosen color database, falling back to the one
# in the .pynche file. # in the .pynche file.
if dbfile is None: if dbfile is None:
dbfile = s.optiondb()['DBFILE'] dbfile = s.optiondb().get('DBFILE')
# find a parseable color database # find a parseable color database
colordb = None colordb = None
files = RGB_TXT[:] files = RGB_TXT[:]
if dbfile is None:
dbfile = files.pop()
while colordb is None: while colordb is None:
try: try:
colordb = ColorDB.get_colordb(dbfile) colordb = ColorDB.get_colordb(dbfile)