From: Barry Warsaw <barry@python.org>
Date: Thu, 4 Dec 1997 19:44:30 +0000 (+0000)
Subject: Only parsing requires Python 1.5
X-Git-Tag: v1.5b2~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90136b08b680a90f4962fabf7bf63a9c9a3a1753;p=python

Only parsing requires Python 1.5
---

diff --git a/Tools/world/world b/Tools/world/world
index 01ec4c2a8c..e973adebc6 100755
--- a/Tools/world/world
+++ b/Tools/world/world
@@ -1,4 +1,4 @@
-#! /usr/bin/env python1.5
+#! /usr/bin/env python
 
 """Print the long name of an Internet domain.
 
@@ -51,11 +51,6 @@ __source__ = '<url:http://www.python.org/~bwarsaw/pyware/>'
 import sys
 import string
 import getopt
-try:
-    import re
-except ImportError:
-    print 'Python 1.5 is required!'
-    sys.exit(1)
 
 
 
@@ -80,6 +75,12 @@ def resolve(rawaddr):
 
 
 def parse(file, normalize):
+    try:
+	import re
+    except ImportError:
+	print 'Parsing requires Python 1.5'
+	sys.exit(1)
+
     try:
 	fp = open(file)
     except IOError, (err, msg):