[Python-checkins] cpython (merge 3.5 -> default): Issue #25097: Merge with 3.5

[zach.ware]

https://hg.python.org/cpython/rev/db782c81bba9
changeset:   98570:db782c81bba9
parent:      98567:d91f9fc7b85d
parent:      98569:95a26798819b
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Oct 06 15:29:09 2015 -0500
summary:
  Issue #25097: Merge with 3.5

files:
  Lib/test/test_logging.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -4136,6 +4136,7 @@
         except pywintypes.error as e:
             if e.winerror == 5:  # access denied
                 raise unittest.SkipTest('Insufficient privileges to run test')
+            raise
 
         r = logging.makeLogRecord({'msg': 'Test Log Message'})
         h.handle(r)

-- 
Repository URL: https://hg.python.org/cpython