[Python-checkins] cpython (merge 3.6 -> default): Issue #28930: Merge from 3.6.

[xiang.zhang]

https://hg.python.org/cpython/rev/c4bcca326c0a
changeset:   105636:c4bcca326c0a
parent:      105634:654ec6ed3225
parent:      105635:56a7eb5a0679
user:        Xiang Zhang <angwerzx at 126.com>
date:        Thu Dec 15 17:05:04 2016 +0800
summary:
  Issue #28930: Merge from 3.6.

files:
  Makefile.pre.in |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -858,8 +858,8 @@
 		$(srcdir)/Objects/stringlib/unicode_format.h \
 		$(srcdir)/Objects/stringlib/unicodedefs.h
 
+Objects/bytes_methods.o: $(srcdir)/Objects/bytes_methods.c $(BYTESTR_DEPS)
 Objects/bytesobject.o: $(srcdir)/Objects/bytesobject.c $(BYTESTR_DEPS)
-
 Objects/bytearrayobject.o: $(srcdir)/Objects/bytearrayobject.c $(BYTESTR_DEPS)
 
 Objects/unicodeobject.o: $(srcdir)/Objects/unicodeobject.c $(UNICODE_DEPS)

-- 
Repository URL: https://hg.python.org/cpython