From: Barry Warsaw <barry@python.org>
Date: Fri, 2 Oct 1998 14:14:39 +0000 (+0000)
Subject: resolve(): Improved use of a/an, suggested by Tino Wildenhain
X-Git-Tag: v1.5.2a2~177
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff45d54f31fefd78b70b8a022fbbf7283f45fb08;p=thirdparty%2FPython%2Fcpython.git

resolve(): Improved use of a/an, suggested by Tino Wildenhain
<cdtv@amigager.de>.
---

diff --git a/Tools/world/world b/Tools/world/world
index 4fb95f39c5ce..6d851541e3a0 100755
--- a/Tools/world/world
+++ b/Tools/world/world
@@ -110,7 +110,11 @@ def resolve(rawaddr):
 	return rawaddr
     addr = parts[-1]
     if nameorgs.has_key(addr):
-	print rawaddr, 'is from a', nameorgs[addr], 'organization'
+        if string.lower(nameorgs[addr][0]) in 'aeiou':
+            ana = 'an'
+        else:
+            ana = 'a'
+	print rawaddr, 'is from', ana, nameorgs[addr], 'organization'
 	return None
     elif countries.has_key(addr):
 	print rawaddr, 'originated from', countries[addr]