Skip to content

Commit a8fef37

Browse files
committed
#11565: Merge with 3.1.
2 parents e21d50c + 6a6e1e5 commit a8fef37

2,184 files changed

Lines changed: 293203 additions & 192048 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bzrignore

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,12 @@ python
1111
build
1212
Makefile.pre
1313
platform
14+
pybuilddir.txt
1415
pyconfig.h
1516
libpython*.a
1617
python.exe
17-
CP936.TXT
18-
SHIFT_JISX0213.TXT
19-
JOHAB.TXT
20-
EUC-JP.TXT
21-
NormalizationTest-3.2.0.txt
22-
NormalizationTest.txt
23-
BIG5.TXT
24-
BIG5HKSCS-2004.TXT
25-
CP949.TXT
26-
EUC-CN.TXT
27-
BIG5HKSCS.TXT
28-
SHIFTJIS.TXT
29-
EUC-KR.TXT
30-
EUC-JISX0213.TXT
31-
CP932.TXT
32-
CP950.TXT
18+
python-gdb.py
3319
reflog.txt
34-
gb-18030-2000.xml
3520
tags
3621
TAGS
3722
.gdb_history
@@ -47,5 +32,8 @@ Modules/Setup.local
4732
Modules/config.c
4833
Modules/ld_so_aix
4934
Parser/pgen
35+
Parser/pgen.stamp
36+
Lib/test/data/*
5037
Lib/lib2to3/Grammar*.pickle
5138
Lib/lib2to3/PatternGrammar*.pickle
39+
__pycache__

.gitignore

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
*.cover
2+
*.o
3+
*.orig
4+
*.pyc
5+
*.pyd
6+
*.pyo
7+
*.rej
8+
*~
9+
Doc/build/
10+
Doc/tools/docutils/
11+
Doc/tools/jinja2/
12+
Doc/tools/pygments/
13+
Doc/tools/sphinx/
14+
Lib/lib2to3/*.pickle
15+
Makefile
16+
Makefile.pre
17+
Misc/python.pc
18+
Modules/Setup
19+
Modules/Setup.config
20+
Modules/Setup.local
21+
Modules/config.c
22+
Modules/ld_so_aix
23+
PCbuild/*.bsc
24+
PCbuild/*.dll
25+
PCbuild/*.exe
26+
PCbuild/*.exp
27+
PCbuild/*.lib
28+
PCbuild/*.ncb
29+
PCbuild/*.o
30+
PCbuild/*.pdb
31+
PCbuild/Win32-temp-*
32+
Parser/pgen
33+
Parser/pgen.stamp
34+
__pycache__
35+
autom4te.cache
36+
build/
37+
config.log
38+
config.status
39+
libpython*.a
40+
pybuilddir.txt
41+
pyconfig.h
42+
python
43+
python-gdb.py
44+
tags

.hgignore

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,45 @@
11
.gdb_history
22
.purify
3-
.svn
4-
BIG5.TXT
5-
BIG5HKSCS-2004.TXT
6-
BIG5HKSCS.TXT
7-
CP932.TXT
8-
CP936.TXT
9-
CP949.TXT
10-
CP950.TXT
11-
EUC-CN.TXT
12-
EUC-JISX0213.TXT
13-
EUC-JP.TXT
14-
EUC-KR.TXT
15-
JOHAB.TXT
3+
.svn/
164
Makefile$
175
Makefile.pre$
18-
NormalizationTest-3.2.0.txt
19-
NormalizationTest.txt
20-
SHIFTJIS.TXT
21-
SHIFT_JISX0213.TXT
22-
TAGS
23-
autom4te.cache
24-
build
25-
buildno
6+
TAGS$
7+
autom4te.cache$
8+
build/
9+
buildno$
2610
config.cache
2711
config.log
2812
config.status
2913
config.status.lineno
3014
db_home
31-
gb-18030-2000.xml
32-
platform
33-
pyconfig.h
34-
python
35-
python.exe
36-
reflog.txt
37-
tags
15+
platform$
16+
pyconfig.h$
17+
python$
18+
python.exe$
19+
reflog.txt$
20+
tags$
3821
Lib/plat-mac/errors.rsrc.df.rsrc
3922
Doc/tools/sphinx/
4023
Doc/tools/docutils/
4124
Doc/tools/jinja/
4225
Doc/tools/jinja2/
4326
Doc/tools/pygments/
4427
Misc/python.pc
45-
Modules/Setup
28+
Modules/Setup$
4629
Modules/Setup.config
4730
Modules/Setup.local
4831
Modules/config.c
49-
Parser/pgen
50-
core
5132
Modules/ld_so_aix$
33+
Parser/pgen$
34+
Parser/pgen.stamp$
35+
^core
36+
^python-gdb.py
37+
^python.exe-gdb.py
38+
^pybuilddir.txt
39+
5240
syntax: glob
5341
libpython*.a
42+
*.swp
5443
*.o
5544
*.pyc
5645
*.pyo
@@ -60,6 +49,8 @@ libpython*.a
6049
*.rej
6150
*~
6251
Lib/lib2to3/*.pickle
52+
Lib/test/data/*
53+
Misc/*.wpu
6354
PC/python_nt*.h
6455
PC/pythonnt_rc*.h
6556
PC/*.obj
@@ -72,3 +63,4 @@ PCbuild/*.o
7263
PCbuild/*.ncb
7364
PCbuild/*.bsc
7465
PCbuild/Win32-temp-*
66+
__pycache__

Demo/README

Lines changed: 0 additions & 61 deletions
This file was deleted.

Demo/cgi/README

Lines changed: 0 additions & 10 deletions
This file was deleted.

Demo/cgi/cgi0.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

Demo/cgi/cgi1.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

Demo/cgi/cgi2.py

Lines changed: 0 additions & 22 deletions
This file was deleted.

Demo/cgi/cgi3.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)