From: Tim Peters <tim.peters@gmail.com>
Date: Tue, 18 Feb 2003 20:50:45 +0000 (+0000)
Subject: save_global():  Trying to resolve module.name can fail for two
X-Git-Tag: v2.3c1~1793
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9ce7cd8b8cea66e3ad062fb273efdbf14a7e4e0;p=thirdparty%2FPython%2Fcpython.git

save_global():  Trying to resolve module.name can fail for two
reasons:  importing module can fail, or the attribute lookup
module.name can fail.  We were giving the same error msg for
both cases, making it needlessly hard to guess what went wrong.
These cases give different error msgs now.
---

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index ad087a9f2575..0d78e49f8f3b 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -2021,14 +2021,16 @@ save_global(Picklerobject *self, PyObject *args, PyObject *name)
 	mod = PyImport_ImportModule(module_str);
 	if (mod == NULL) {
 		cPickle_ErrFormat(PicklingError,
-				  "Can't pickle %s: it's not found as %s.%s",
-				  "OSS", args, module, global_name);
+				  "Can't pickle %s: import of module %s "
+				  "failed",
+				  "OS", args, module);
 		goto finally;
 	}
 	klass = PyObject_GetAttrString(mod, name_str);
 	if (klass == NULL) {
 		cPickle_ErrFormat(PicklingError,
-				  "Can't pickle %s: it's not found as %s.%s",
+				  "Can't pickle %s: attribute lookup %s.%s "
+				  "failed",
 				  "OSS", args, module, global_name);
 		goto finally;
 	}