From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 1 Jan 2016 16:25:12 +0000 (-0600)
Subject: merge 3.4
X-Git-Tag: v3.6.0a1~835^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c70293755ce8ea0adc5b224c714da2b7625d232;p=python

merge 3.4
---

4c70293755ce8ea0adc5b224c714da2b7625d232
diff --cc PC/python_ver_rc.h
index 827e9be528,0000000000..8ad18ef78f
mode 100644,000000..100644
--- a/PC/python_ver_rc.h
+++ b/PC/python_ver_rc.h
@@@ -1,35 -1,0 +1,35 @@@
 +// Resource script for Python core DLL.
 +// Currently only holds version information.
 +//
 +#include "winver.h"
 +
 +#define PYTHON_COMPANY   "Python Software Foundation"
- #define PYTHON_COPYRIGHT "Copyright \xA9 2001-2015 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC."
++#define PYTHON_COPYRIGHT "Copyright \xA9 2001-2016 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC."
 +
 +#define MS_WINDOWS
 +#include "modsupport.h"
 +#include "patchlevel.h"
 +#ifdef _DEBUG
 +#   include "pythonnt_rc_d.h"
 +#   define PYTHON_DEBUG_EXT "_d"
 +#else
 +#   include "pythonnt_rc.h"
 +#   define PYTHON_DEBUG_EXT
 +#endif
 +
 +/* e.g., 3.3.0a1
 + * PY_VERSION comes from patchlevel.h
 + */
 +#define PYTHON_VERSION PY_VERSION "\0"
 +
 +/* 64-bit version number as comma-separated list of 4 16-bit ints */
 +#if PY_MICRO_VERSION > 64
 +#   error "PY_MICRO_VERSION > 64"
 +#endif
 +#if PY_RELEASE_LEVEL > 99
 +#   error "PY_RELEASE_LEVEL > 99"
 +#endif
 +#if PY_RELEASE_SERIAL > 9
 +#   error "PY_RELEASE_SERIAL > 9"
 +#endif
 +#define PYVERSION64 PY_MAJOR_VERSION, PY_MINOR_VERSION, FIELD3, PYTHON_API_VERSION
diff --cc README
index 84aaef908b,d27ede2bcc..2335889b3a
--- a/README
+++ b/README
@@@ -2,13 -2,12 +2,13 @@@ This is Python version 3.5.
  ============================
  
  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
- 2012, 2013, 2014, 2015 Python Software Foundation.  All rights reserved.
+ 2012, 2013, 2014, 2015, 2016 Python Software Foundation.  All rights reserved.
  
 -Python 3.x is a new version of the language, which is incompatible with the 2.x
 -line of releases.  The language is mostly the same, but many details, especially
 -how built-in objects like dictionaries and strings work, have changed
 -considerably, and a lot of deprecated features have finally been removed.
 +Python 3.x is a new version of the language, which is incompatible with the
 +2.x line of releases.  The language is mostly the same, but many details,
 +especially how built-in objects like dictionaries and strings work,
 +have changed considerably, and a lot of deprecated features have finally
 +been removed.
  
  
  Build Instructions