merge 3.4 · pythoncapi/cpython@4365833 · GitHub
Skip to content

Commit 4365833

Browse files
benjaminpbenjaminp
committed
merge 3.4
2 parents 4950ae1 + b6e2142 commit 4365833

7 files changed

Lines changed: 9 additions & 8 deletions

File tree

‎Doc/license.rst‎

Lines changed: 1 addition & 1 deletion

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ analyze, test, perform and/or display publicly, prepare derivative works,
7474
distribute, and otherwise use Python alone or in any derivative version,
7575
provided, however, that PSF's License Agreement and PSF's notice of copyright,
7676
i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
77-
2011, 2012, 2013, 2014, 2015, 2016 Python Software Foundation; All Rights
77+
2011, 2012, 2013, 2014, 2015, 2016, 2017 Python Software Foundation; All Rights
7878
Reserved" are retained in Python alone or in any derivative version prepared by
7979
Licensee.
8080

‎Mac/PythonLauncher/Info.plist.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<key>CFBundleExecutable</key>
4141
<string>Python Launcher</string>
4242
<key>CFBundleGetInfoString</key>
43-
<string>%VERSION%, © 2001-2016 Python Software Foundation</string>
43+
<string>%VERSION%, © 2001-2017 Python Software Foundation</string>
4444
<key>CFBundleIconFile</key>
4545
<string>PythonLauncher.icns</string>
4646
<key>CFBundleIdentifier</key>

‎Mac/Resources/app/Info.plist.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<key>CFBundleInfoDictionaryVersion</key>
3838
<string>6.0</string>
3939
<key>CFBundleLongVersionString</key>
40-
<string>%version%, (c) 2001-2016 Python Software Foundation.</string>
40+
<string>%version%, (c) 2001-2017 Python Software Foundation.</string>
4141
<key>CFBundleName</key>
4242
<string>Python</string>
4343
<key>CFBundlePackageType</key>

‎Mac/Resources/framework/Info.plist.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>FMWK</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>%VERSION%, (c) 2001-2016 Python Software Foundation.</string>
20+
<string>%VERSION%, (c) 2001-2017 Python Software Foundation.</string>
2121
<key>CFBundleLongVersionString</key>
22-
<string>%VERSION%, (c) 2001-2016 Python Software Foundation.</string>
22+
<string>%VERSION%, (c) 2001-2017 Python Software Foundation.</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleVersion</key>

‎Python/getcopyright.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
static const char cprt[] =
66
"\
7-
Copyright (c) 2001-2016 Python Software Foundation.\n\
7+
Copyright (c) 2001-2017 Python Software Foundation.\n\
88
All Rights Reserved.\n\
99
\n\
1010
Copyright (c) 2000 BeOpen.com.\n\

‎README‎

Lines changed: 2 additions & 1 deletion

0 commit comments

Comments
 (0)