From: Brian Curtin <brian.curtin@gmail.com>
Date: Wed, 21 Jul 2010 01:46:44 +0000 (+0000)
Subject: Merged revisions 83009 via svnmerge from
X-Git-Tag: v3.1.3rc1~483
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=823de0028639ef94a58a0a8652e8e7e15eeee198;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 83009 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83009 | brian.curtin | 2010-07-20 20:44:19 -0500 (Tue, 20 Jul 2010) | 2 lines

  Fix #9316. if/is grammar corrections.
........
---

diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index 734445cbbaab..8d04f17e4bdf 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -523,19 +523,19 @@ PyDoc_STRVAR(doc_is_package,
 "is_package(fullname) -> bool.\n\
 \n\
 Return True if the module specified by fullname is a package.\n\
-Raise ZipImportError is the module couldn't be found.");
+Raise ZipImportError if the module couldn't be found.");
 
 PyDoc_STRVAR(doc_get_code,
 "get_code(fullname) -> code object.\n\
 \n\
 Return the code object for the specified module. Raise ZipImportError\n\
-is the module couldn't be found.");
+if the module couldn't be found.");
 
 PyDoc_STRVAR(doc_get_source,
 "get_source(fullname) -> source string.\n\
 \n\
 Return the source code for the specified module. Raise ZipImportError\n\
-is the module couldn't be found, return None if the archive does\n\
+if the module couldn't be found, return None if the archive does\n\
 contain the module, but has no source for it.");