diff --git a/Lib/getopt.py b/Lib/getopt.py
index 692b8b9..761fc4f 100644
--- a/Lib/getopt.py
+++ b/Lib/getopt.py
@@ -7,9 +7,6 @@
 may be used as well via an optional third argument.  This module
 provides a single function and an exception:
 
-Gerrit Holl <gerrit@nl.linux.org> moved the string-based exceptions
-to class-based exceptions.
-
 getopt() -- Parse command line options
 GetoptError -- exception (class) raised with 'opt' attribute, which is the
 option involved with the exception.
@@ -17,6 +14,9 @@
 
 # Long option support added by Lars Wirzenius <liw@iki.fi>.
 
+# Gerrit Holl <gerrit@nl.linux.org> moved the string-based exceptions
+# to class-based exceptions.
+
 import string
 
 class GetoptError(Exception):
@@ -81,7 +81,7 @@
 
 def do_longs(opts, opt, longopts, args):
     try:
-        i = string.index(opt, '=')
+        i = opt.index('=')
         opt, optarg = opt[:i], opt[i+1:]
     except ValueError:
         optarg = None