summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-06-11 23:46:47 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-06-11 23:46:47 (GMT)
commit0f35e2c0f44b2012e4e32aaccde6fa42756e61f1 (patch)
tree18a6f8dcfdf211b7b63825b3a09eea5a691b0389
parent7909b0085a86c6956506ff1892fdc6feac2dbfd1 (diff)
downloadcpython-0f35e2c0f44b2012e4e32aaccde6fa42756e61f1.zip
cpython-0f35e2c0f44b2012e4e32aaccde6fa42756e61f1.tar.gz
cpython-0f35e2c0f44b2012e4e32aaccde6fa42756e61f1.tar.bz2
Issue #8784: Set tarfile default encoding to 'utf-8' on Windows.
Note: file system encoding cannot be None anymore (since r81190, issue #8610).
-rw-r--r--Doc/library/tarfile.rst4
-rw-r--r--Lib/tarfile.py7
-rw-r--r--Misc/NEWS2
3 files changed, 8 insertions, 5 deletions
diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
index c2a9143..b1d7361 100644
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -185,8 +185,8 @@ The following variables are available on module level:
.. data:: ENCODING
- The default character encoding i.e. the value from either
- :func:`sys.getfilesystemencoding` or :func:`sys.getdefaultencoding`.
+ The default character encoding: ``'utf-8'`` on Windows,
+ :func:`sys.getfilesystemencoding` otherwise.
.. seealso::
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 31967dd..4839eb1 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -159,9 +159,10 @@ TOEXEC = 0o001 # execute/search by other
#---------------------------------------------------------
# initialization
#---------------------------------------------------------
-ENCODING = sys.getfilesystemencoding()
-if ENCODING is None:
- ENCODING = "ascii"
+if os.name in ("nt", "ce"):
+ ENCODING = "utf-8"
+else:
+ ENCODING = sys.getfilesystemencoding()
#---------------------------------------------------------
# Some useful functions
diff --git a/Misc/NEWS b/Misc/NEWS
index 1335dbc..5a59310 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -421,6 +421,8 @@ C-API
Library
-------
+- Issue #8784: Set tarfile default encoding to 'utf-8' on Windows.
+
- Issue #8966: If a ctypes structure field is an array of c_char, convert its
value to bytes instead of str (as done for c_char and c_char_p).