Add URL for PEP to the source code encoding warning.

Remove the usage of PyErr_WarnExplicit() since this could cause
sensitive information from the source files to appear in e.g.
log files.

diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 4952a3c44702e26ae0e3ccb83f30d8c045e01fa3..a97720c54cf3d1544f7b7eed4e1d834091eb5819 100644 (file)
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -462,14 +462,20 @@ decoding_fgets(char *s, int size, struct tok_state *tok)
                        }
        }
        if (badchar) {
-               char buf[200];
-               sprintf(buf, "Non-ASCII character '\\x%.2x', "
-                       "but no declared encoding", badchar);
+               char buf[500];
                /* Need to add 1 to the line number, since this line
                   has not been counted, yet.  */
-               PyErr_WarnExplicit(PyExc_DeprecationWarning,
-                                  buf, tok->filename, tok->lineno + 1, 
-                                  NULL, NULL);
+               sprintf(buf, 
+                       "Non-ASCII character '\\x%.2x' "
+                       "in file %.200s on line %i, "
+                       "but no encoding declared; "
+                       "see http://www.python.org/peps/pep-0263.html for details", 
+                       badchar, tok->filename, tok->lineno + 1);
+               /* We don't use PyErr_WarnExplicit() here because
+                  printing the line in question to e.g. a log file
+                  could result in sensitive information being
+                  exposed. */
+               PyErr_Warn(PyExc_DeprecationWarning, buf);
                tok->issued_encoding_warning = 1;
        }
 #endif