From: Barry Warsaw <barry@python.org>
Date: Wed, 3 Sep 2003 03:15:50 +0000 (+0000)
Subject: Fix for SF bug #780996, crash when no .pynche file exists and -d
X-Git-Tag: v2.4a1~1660
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb296d967b4e1ff2e87d652cf1d80f6adedb1228;p=python

Fix for SF bug #780996, crash when no .pynche file exists and -d
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.
---

diff --git a/Tools/pynche/Main.py b/Tools/pynche/Main.py
index 59d2527a4c..1fa3f175c8 100644
--- a/Tools/pynche/Main.py
+++ b/Tools/pynche/Main.py
@@ -46,7 +46,7 @@ Where:
         initial color, as a color name or #RRGGBB format
 """
 
-__version__ = '1.4'
+__version__ = '1.4.1'
 
 import sys
 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
     # in the .pynche file.
     if dbfile is None:
-        dbfile = s.optiondb()['DBFILE']
+        dbfile = s.optiondb().get('DBFILE')
     # find a parseable color database
     colordb = None
     files = RGB_TXT[:]
+    if dbfile is None:
+        dbfile = files.pop()
     while colordb is None:
         try:
             colordb = ColorDB.get_colordb(dbfile)