diff options
| author | Raymond Hettinger <python@rcn.com> | 2016-08-25 21:12:16 -0700 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2016-08-25 21:12:16 -0700 |
| commit | f74c33ad5c94f1f07f574336dc2d5a6345acdcc7 (patch) | |
| tree | 7de71390a5ea30877d31e56c5fabf44529c86fd2 /Lib/test | |
| parent | 8f2ee0d5ffe82c5873bff914835724be0107b0c6 (diff) | |
| parent | 7ea386e56e76deb2ceeb87c0ac4b346e24cd82e1 (diff) | |
| download | cpython-git-f74c33ad5c94f1f07f574336dc2d5a6345acdcc7.tar.gz | |
Merge
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/cfgparser.2 | 2 | ||||
| -rw-r--r-- | Lib/test/test_gdb.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/cfgparser.2 b/Lib/test/cfgparser.2 index 1646de8e65..cfcfef23bf 100644 --- a/Lib/test/cfgparser.2 +++ b/Lib/test/cfgparser.2 @@ -129,7 +129,7 @@ # Unix users can map to different SMB User names ; username map = /etc/samba/smbusers -# Using the following line enables you to customise your configuration +# Using the following line enables you to customize your configuration # on a per machine basis. The %m gets replaced with the netbios name # of the machine that is connecting ; include = /etc/samba/smb.conf.%m diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py index 730b628b58..9751b056c1 100644 --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -90,7 +90,7 @@ if not gdbpy_version: raise unittest.SkipTest("gdb not built with embedded python support") # Verify that "gdb" can load our custom hooks, as OS security settings may -# disallow this without a customised .gdbinit. +# disallow this without a customized .gdbinit. _, gdbpy_errors = run_gdb('--args', sys.executable) if "auto-loading has been declined" in gdbpy_errors: msg = "gdb security settings prevent use of custom hooks: " |