summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Unterwaditzer <markus@unterwaditzer.net>2017-02-27 16:35:35 +0100
committerMarkus Unterwaditzer <markus@unterwaditzer.net>2017-02-27 16:35:35 +0100
commit7d51d98cc01d44c6f1bbae726e49d8bcff66d5c4 (patch)
tree7a3826c061bcdc5d48979596c012654ee803023d
parentbbcac04992e1e807604d600d806830cca2b175d8 (diff)
parent5701c4000c39b5a90c45f1083c0cbf4e00731e81 (diff)
downloadclick-7d51d98cc01d44c6f1bbae726e49d8bcff66d5c4.tar.gz
Merge branch '6.x-maintenance'
-rw-r--r--CHANGES1
-rw-r--r--click/_winconsole.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 596bfb1..b17a179 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,7 @@ Version 6.8
- Disabled sys._getframes() on Python interpreters that don't support it. See
#728.
- Fix bug in test runner when calling ``sys.exit`` with ``None``. See #739.
+- Fix crash on Windows console, see #744.
Version 6.7
-----------
diff --git a/click/_winconsole.py b/click/_winconsole.py
index 9aed942..f1d5e28 100644
--- a/click/_winconsole.py
+++ b/click/_winconsole.py
@@ -261,7 +261,7 @@ def _get_windows_console_stream(f, encoding, errors):
func = _stream_factories.get(f.fileno())
if func is not None:
if not PY2:
- f = getattr(f, 'buffer')
+ f = getattr(f, 'buffer', None)
if f is None:
return None
else: