From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 22 Mar 2013 15:23:13 +0000 (+0000)
Subject: Issue #17508: Merged fix from 3.2.
X-Git-Tag: v3.3.1rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=340a4bb2fe38f7d203beb7890d75e0383e3cca7c;p=thirdparty%2FPython%2Fcpython.git

Issue #17508: Merged fix from 3.2.
---

340a4bb2fe38f7d203beb7890d75e0383e3cca7c
diff --cc Lib/test/test_logging.py
index cb908fb4600b,bbd485267ad6..69da27a94585
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@@ -2664,28 -2024,11 +2694,33 @@@ class ConfigDictTest(BaseTest)
              # Original logger output is empty.
              self.assert_log_lines([])
  
+     def test_out_of_order(self):
+         self.apply_config(self.out_of_order)
+         handler = logging.getLogger('mymodule').handlers[0]
+         self.assertIsInstance(handler.target, logging.Handler)
+ 
 +    def test_baseconfig(self):
 +        d = {
 +            'atuple': (1, 2, 3),
 +            'alist': ['a', 'b', 'c'],
 +            'adict': {'d': 'e', 'f': 3 },
 +            'nest1': ('g', ('h', 'i'), 'j'),
 +            'nest2': ['k', ['l', 'm'], 'n'],
 +            'nest3': ['o', 'cfg://alist', 'p'],
 +        }
 +        bc = logging.config.BaseConfigurator(d)
 +        self.assertEqual(bc.convert('cfg://atuple[1]'), 2)
 +        self.assertEqual(bc.convert('cfg://alist[1]'), 'b')
 +        self.assertEqual(bc.convert('cfg://nest1[1][0]'), 'h')
 +        self.assertEqual(bc.convert('cfg://nest2[1][1]'), 'm')
 +        self.assertEqual(bc.convert('cfg://adict.d'), 'e')
 +        self.assertEqual(bc.convert('cfg://adict[f]'), 3)
 +        v = bc.convert('cfg://nest3')
 +        self.assertEqual(v.pop(1), ['a', 'b', 'c'])
 +        self.assertRaises(KeyError, bc.convert, 'cfg://nosuch')
 +        self.assertRaises(ValueError, bc.convert, 'cfg://!')
 +        self.assertRaises(KeyError, bc.convert, 'cfg://adict[2]')
 +
  class ManagerTest(BaseTest):
      def test_manager_loggerclass(self):
          logged = []