[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

Tue Apr 14 01:35:05 CEST 2015

https://hg.python.org/cpython/rev/4dd6c8dc34ff
changeset: 95622:4dd6c8dc34ff
parent: 95620:e75fd221a53e
parent: 95621:45a85d581873
user: Zachary Ware <zachary.ware at gmail.com>
date: Mon Apr 13 18:34:57 2015 -0500
summary:
 Merge with 3.4
files:
 Tools/clinic/clinic.py | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -4227,7 +4227,7 @@
 cmdline.print_usage()
 sys.exit(-1)
 for root, dirs, files in os.walk('.'):
- for rcs_dir in ('.svn', '.git', '.hg', 'build'):
+ for rcs_dir in ('.svn', '.git', '.hg', 'build', 'externals'):
 if rcs_dir in dirs:
 dirs.remove(rcs_dir)
 for filename in files:
-- 
Repository URL: https://hg.python.org/cpython
