From c35c7237d6b82a623683ed02ca0fa9427f1d1759 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sun, 28 Sep 2014 19:27:02 +0200 Subject: [PATCH] Other problems with encodings --- ChangeLog | 2 ++ README | 3 ++- TODO | 6 ++---- waflib/Logs.py | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21f3e138..016947b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ NEW IN WAF 1.8.0 * Console handling improvements * Properly-sized progress bar on windows * Generic configuration tests +* Better unicode handlig in scripts and in file names +* Shorter build outputs NEW IN WAF 1.7.11 ----------------- diff --git a/README b/README index 51544e63..36e85715 100644 --- a/README +++ b/README @@ -10,7 +10,8 @@ For the examples: see the folder demos/ HOW TO CREATE THE WAF SCRIPT ---------------------------- -Python 2.6, 2.7, 3.0, 3.1 or 3.2 is required to generate the waf script. Execute: +Python 2.6, 2.7, 3.0, 3.1, 3.2, 3.3 or 3.4 is required to generate the waf script. The waf script is then the version that can run on Python 2.4 and 2.5. +Just execute: $ ./waf-light configure build Or, if you have several python versions installed: $ python3 ./waf-light configure build diff --git a/TODO b/TODO index 81a7cac3..8e7976c2 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,7 @@ -Waf 1.7.x +Waf 1.8.x --------- -* fix the remaining bugs -* provide more extensions - +* Update the docs Can be useful: diff --git a/waflib/Logs.py b/waflib/Logs.py index 00ea9deb..c83d9317 100644 --- a/waflib/Logs.py +++ b/waflib/Logs.py @@ -163,7 +163,7 @@ class log_handler(logging.StreamHandler): else: stream.write(fs % msg) except UnicodeError: - stream.write(fs % msg.encode("UTF-8")) + stream.write((fs % msg).encode("UTF-8")) else: logging.StreamHandler.emit(self, record)