summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-06-03 22:03:22 (GMT)
committerGuido van Rossum <guido@python.org>1997-06-03 22:03:22 (GMT)
commit5bf4d0088707fc1065dd8d31d5d1ced52c95e5f5 (patch)
treefab042dd46ae6094ba44790c4d66909258d5f404
parent876736cd0d2f4f5578a0508585a51771c654e5b7 (diff)
downloadcpython-5bf4d0088707fc1065dd8d31d5d1ced52c95e5f5.zip
cpython-5bf4d0088707fc1065dd8d31d5d1ced52c95e5f5.tar.gz
cpython-5bf4d0088707fc1065dd8d31d5d1ced52c95e5f5.tar.bz2
Move the second import of faqcust to the very end.
-rw-r--r--Tools/faqwiz/faqconf.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/Tools/faqwiz/faqconf.py b/Tools/faqwiz/faqconf.py
index dce947f..27ddcf9 100644
--- a/Tools/faqwiz/faqconf.py
+++ b/Tools/faqwiz/faqconf.py
@@ -46,7 +46,7 @@ entries marked with * were changed within the last 7 days.)
# Version -- don't change unless you edit faqwiz.py
-WIZVERSION = "0.5" # FAQ Wizard version
+WIZVERSION = "0.6" # FAQ Wizard version
# This parameter is normally overwritten with a dynamic value
@@ -78,13 +78,6 @@ except ImportError:
COOKIE_NAME = SHORTNAME + "-FAQ-Wizard" # Name used for Netscape cookie
FAQNAME = SHORTNAME + " FAQ" # Name of the FAQ
-# Load local customizations again, in case they set COOKIE_NAME or FAQNAME
-
-try:
- from faqcust import *
-except ImportError:
- pass
-
# ----------------------------------------------------------------------
# Anything below this point normally needn't be changed; you would
@@ -543,3 +536,10 @@ Any line that begins with a space or tab is assumed to be part of
literal text. Blocks of literal text delineated by blank lines are
placed inside &lt;PRE&gt;...&lt;/PRE&gt;.
"""
+
+# Load local customizations again, in case they set some other variables
+
+try:
+ from faqcust import *
+except ImportError:
+ pass