summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2000-05-09 19:55:16 (GMT)
committerFred Drake <fdrake@acm.org>2000-05-09 19:55:16 (GMT)
commitc640b18d96b995c0bf61527317f7982b04bac21a (patch)
treedf6018614c0afbcd8781369112d3bbb2b6d7b2be
parent785d14f965b7ff91e89e3c9e08c733e9351d9a7e (diff)
downloadcpython-c640b18d96b995c0bf61527317f7982b04bac21a.zip
cpython-c640b18d96b995c0bf61527317f7982b04bac21a.tar.gz
cpython-c640b18d96b995c0bf61527317f7982b04bac21a.tar.bz2
M.-A. Lemburg <mal@lemburg.com>:
Fixed docs according to the new behaviour (the Unicode encoding is no longer fixed to UTF-8).
-rw-r--r--Python/bltinmodule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 1df95d7..b6c5323 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -193,8 +193,8 @@ static char unicode_doc[] =
"unicode(string [, encoding[, errors]]) -> object\n\
\n\
Creates a new Unicode object from the given encoded string.\n\
-encoding defaults to 'utf-8' and errors, defining the error handling,\n\
-to 'strict'.";
+encoding defaults to the current default string encoding and \n\
+errors, defining the error handling, to 'strict'.";
static PyObject *