summaryrefslogtreecommitdiff
path: root/Python/future.c
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-28 01:07:08 +0000
committerMartin Panter <vadmium+py@gmail.com>2016-05-28 01:07:08 +0000
commit30a919d162fc7f5072de7fecde86da3d9b43d3e8 (patch)
tree32f34d92e32755208fab34fcc543a8996b0039d3 /Python/future.c
parentf04b85e6c166e9f31aa167d63e92c49595c858d6 (diff)
parent1f1268c0bc93629b7abc16d8af9cf997c32a947b (diff)
downloadcpython-30a919d162fc7f5072de7fecde86da3d9b43d3e8.tar.gz
Issue #20699: Merge io bytes-like fixes from 3.5
Diffstat (limited to 'Python/future.c')
-rw-r--r--Python/future.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Python/future.c b/Python/future.c
index 163f87f673..75f210769e 100644
--- a/Python/future.c
+++ b/Python/future.c
@@ -79,7 +79,10 @@ future_parse(PyFutureFeatures *ff, mod_ty mod, PyObject *filename)
i = 0;
first = (stmt_ty)asdl_seq_GET(mod->v.Module.body, i);
- if (first->kind == Expr_kind && first->v.Expr.value->kind == Str_kind)
+ if (first->kind == Expr_kind
+ && (first->v.Expr.value->kind == Str_kind
+ || (first->v.Expr.value->kind == Constant_kind
+ && PyUnicode_CheckExact(first->v.Expr.value->v.Constant.value))))
i++;