More has_key() fixes.
The optparse fix is a fix to the previous fix, which broke has_option().
diff --git a/Lib/optparse.py b/Lib/optparse.py
index a02f79a..0972f74 100644
--- a/Lib/optparse.py
+++ b/Lib/optparse.py
@@ -1040,7 +1040,7 @@
 
     def has_option(self, opt_str):
         return (opt_str in self._short_opt or
-                opt_str) in self._long_opt
+                opt_str in self._long_opt)
 
     def remove_option(self, opt_str):
         option = self._short_opt.get(opt_str)