small formatting improvements

1 files changed, 84 insertions, 81 deletions

diff --git a/iniherit/test.py b/iniherit/test.py
index 446d87d..fddd93a 100644
--- a/iniherit/test.py
+++ b/iniherit/test.py
@@ -8,6 +8,8 @@
 
 import unittest
 import io
+import textwrap
+
 import six
 
 from iniherit.parser import Loader, ConfigParser, SafeConfigParser
@@ -29,22 +31,22 @@ class TestIniherit(unittest.TestCase):
 
   #----------------------------------------------------------------------------
   def test_iniherit(self):
-    files = [
-      ('base.ini', '''\
-[DEFAULT]
-kw1 = base-kw1
-kw2 = base-kw2
-[section]
-test1 = only in base, the value "%(kw1)s" should be "base-kw1"
-test2 = the value "%(kw2)s" should be "base-kw2"
-'''),
-      ('extend.ini', '''\
-[DEFAULT]
-%inherit = base.ini
-kw1 = extend-kw1
-'''),
-    ]
-    parser = ConfigParser(loader=ByteLoader(dict(files)))
+    files = {k: textwrap.dedent(v) for k, v in {
+      'base.ini' : '''
+        [DEFAULT]
+        kw1 = base-kw1
+        kw2 = base-kw2
+        [section]
+        test1 = only in base, the value "%(kw1)s" should be "base-kw1"
+        test2 = the value "%(kw2)s" should be "base-kw2"
+      ''',
+      'extend.ini' : '''
+        [DEFAULT]
+        %inherit = base.ini
+        kw1 = extend-kw1
+      ''',
+    }.items()}
+    parser = ConfigParser(loader=ByteLoader(files))
     parser.read('extend.ini')
     self.assertEqual(parser.get('DEFAULT', 'kw1'), 'extend-kw1')
     self.assertEqual(parser.get('DEFAULT', 'kw2'), 'base-kw2')
@@ -56,29 +58,29 @@ kw1 = extend-kw1
 
   #----------------------------------------------------------------------------
   def test_iniherit_multiple(self):
-    files = [
-      ('base.ini', '''\
-[DEFAULT]
-kw1 = base-kw1
-kw2 = base-kw2
-kw3 = base-kw3
-kw4 = base-kw4
-'''),
-      ('override.ini', '''\
-[DEFAULT]
-kw2 = override-kw2
-kw3 = override-kw3
-kw5 = override-kw5
-'''),
-      ('extend.ini', '''\
-[DEFAULT]
-%inherit = base.ini ?no-such-ini.ini override.ini
-kw1 = extend-kw1
-kw3 = extend-kw3
-kw6 = extend-kw6
-'''),
-    ]
-    parser = ConfigParser(loader=ByteLoader(dict(files)))
+    files = {k: textwrap.dedent(v) for k, v in {
+      'base.ini' : '''
+        [DEFAULT]
+        kw1 = base-kw1
+        kw2 = base-kw2
+        kw3 = base-kw3
+        kw4 = base-kw4
+      ''',
+      'override.ini' : '''
+        [DEFAULT]
+        kw2 = override-kw2
+        kw3 = override-kw3
+        kw5 = override-kw5
+      ''',
+      'extend.ini' : '''
+        [DEFAULT]
+        %inherit = base.ini ?no-such-ini.ini override.ini
+        kw1 = extend-kw1
+        kw3 = extend-kw3
+        kw6 = extend-kw6
+      ''',
+    }.items()}
+    parser = ConfigParser(loader=ByteLoader(files))
     parser.read('extend.ini')
     self.assertEqual(parser.get('DEFAULT', 'kw1'), 'extend-kw1')
     self.assertEqual(parser.get('DEFAULT', 'kw2'), 'override-kw2')
@@ -89,21 +91,21 @@ kw6 = extend-kw6
 
   #----------------------------------------------------------------------------
   def test_iniherit_noSuchFile(self):
-    files = [
-      ('base.ini',   '[DEFAULT]\nkw1 = base-kw1\n'),
-      ('extend.ini', '[DEFAULT]\n%inherit = base.ini no-such-ini.ini\nkw2 = extend-kw2\n'),
-    ]
-    parser = ConfigParser(loader=ByteLoader(dict(files)))
+    files = {k: textwrap.dedent(v) for k, v in {
+      'base.ini'   : '[DEFAULT]\nkw1 = base-kw1\n',
+      'extend.ini' : '[DEFAULT]\n%inherit = base.ini no-such-ini.ini\nkw2 = extend-kw2\n',
+    }.items()}
+    parser = ConfigParser(loader=ByteLoader(files))
     self.assertRaises(IOError, parser.read, 'extend.ini')
 
   #----------------------------------------------------------------------------
   def test_iniherit_relativePath(self):
-    files = [
-      ('dir/base.ini', '[section]\nkw1 = base-kw1\n'),
-      ('dir/mid.ini',  '[DEFAULT]\n%inherit = base.ini\n[section]\nkw2 = mid-kw2\n'),
-      ('extend.ini',   '[DEFAULT]\n%inherit = dir/mid.ini\n[section]\nkw3 = extend-kw3\n'),
-    ]
-    parser = ConfigParser(loader=ByteLoader(dict(files)))
+    files = {k: textwrap.dedent(v) for k, v in {
+      'dir/base.ini' : '[section]\nkw1 = base-kw1\n',
+      'dir/mid.ini'  : '[DEFAULT]\n%inherit = base.ini\n[section]\nkw2 = mid-kw2\n',
+      'extend.ini'   : '[DEFAULT]\n%inherit = dir/mid.ini\n[section]\nkw3 = extend-kw3\n',
+    }.items()}
+    parser = ConfigParser(loader=ByteLoader(files))
     parser.read('extend.ini')
     self.assertEqual(parser.get('section', 'kw1'), 'base-kw1')
     self.assertEqual(parser.get('section', 'kw2'), 'mid-kw2')
@@ -111,22 +113,22 @@ kw6 = extend-kw6
 
   #----------------------------------------------------------------------------
   def test_iniherit_nameWithSpace(self):
-    files = [
-      ('base + space.ini', '[DEFAULT]\nkw=word\n'),
-      ('config.ini',       '[DEFAULT]\n%inherit = base%20%2b%20space.ini\n'),
-    ]
-    parser = ConfigParser(loader=ByteLoader(dict(files)))
+    files = {k: textwrap.dedent(v) for k, v in {
+      'base + space.ini' : '[DEFAULT]\nkw=word\n',
+      'config.ini'       : '[DEFAULT]\n%inherit = base%20%2b%20space.ini\n',
+    }.items()}
+    parser = ConfigParser(loader=ByteLoader(files))
     parser.read('config.ini')
     self.assertEqual(parser.get('DEFAULT', 'kw'), 'word')
 
   #----------------------------------------------------------------------------
   def test_iniherit_sectionInherit(self):
-    files = [
-      ('base.ini',   '[DEFAULT]\nkw1=word\n[s]\nfoo=bar\nx=y\n'),
-      ('other.ini',  '[DEFAULT]\nkw2=word\n[so]\nzig=zag\n'),
-      ('config.ini', '[s]\n%inherit = base.ini other.ini[so]\nx=z\n'),
-    ]
-    parser = ConfigParser(loader=ByteLoader(dict(files)))
+    files = {k: textwrap.dedent(v) for k, v in {
+      'base.ini'   : '[DEFAULT]\nkw1=word\n[s]\nfoo=bar\nx=y\n',
+      'other.ini'  : '[DEFAULT]\nkw2=word\n[so]\nzig=zag\n',
+      'config.ini' : '[s]\n%inherit = base.ini other.ini[so]\nx=z\n',
+    }.items()}
+    parser = ConfigParser(loader=ByteLoader(files))
     parser.read('config.ini')
     self.assertEqual(parser.items('DEFAULT'), [])
     self.assertEqual(sorted(parser.items('s')),
@@ -134,9 +136,9 @@ kw6 = extend-kw6
 
   #----------------------------------------------------------------------------
   def test_iniherit_interpolation(self):
-    files = [
-      ('config.ini', '[app]\noutput = %(tmpdir)s/var/result.log\n'),
-    ]
+    files = {k: textwrap.dedent(v) for k, v in {
+      'config.ini' : '[app]\noutput = %(tmpdir)s/var/result.log\n',
+    }.items()}
     parser = SafeConfigParser(
       defaults={'tmpdir': '/tmp'}, loader=ByteLoader(dict(files)))
     parser.read('config.ini')
@@ -145,9 +147,9 @@ kw6 = extend-kw6
 
   #----------------------------------------------------------------------------
   def test_iniherit_invalidInterpolationValues(self):
-    files = [
-      ('config.ini', '[logger]\ntimefmt=%H:%M:%S\n'),
-    ]
+    files = {k: textwrap.dedent(v) for k, v in {
+      'config.ini' : '[logger]\ntimefmt=%H:%M:%S\n',
+    }.items()}
     parser = SafeConfigParser(loader=ByteLoader(dict(files)))
     parser.read('config.ini')
     self.assertEqual(parser.items('DEFAULT'), [])
@@ -158,10 +160,10 @@ kw6 = extend-kw6
     from iniherit.parser import CP
     from iniherit.mixin import install_globally, uninstall_globally
 
-    files = [
-      ('base.ini',   '[DEFAULT]\nkw = base-kw\n'),
-      ('config.ini', '[DEFAULT]\n%inherit = base.ini\n'),
-    ]
+    files = {k: textwrap.dedent(v) for k, v in {
+      'base.ini'   : '[DEFAULT]\nkw = base-kw\n',
+      'config.ini' : '[DEFAULT]\n%inherit = base.ini\n',
+    }.items()}
     loader = ByteLoader(dict(files))
 
     def do_the_test():
@@ -185,11 +187,11 @@ kw6 = extend-kw6
 
   #----------------------------------------------------------------------------
   def test_output_order_ascending(self):
-    files = [
-      ('base.ini', '[s1]\ns1v = b1\n[s2]\ns2v = b2\n[s3]\ns3v = b3\n'),
-      ('extend.ini', '[DEFAULT]\n%inherit = base.ini\n[s2]\ns2v = o2'),
-    ]
-    parser = ConfigParser(loader=ByteLoader(dict(files)))
+    files = {k: textwrap.dedent(v) for k, v in {
+      'base.ini' : '[s1]\ns1v = b1\n[s2]\ns2v = b2\n[s3]\ns3v = b3\n',
+      'extend.ini' : '[DEFAULT]\n%inherit = base.ini\n[s2]\ns2v = o2',
+    }.items()}
+    parser = ConfigParser(loader=ByteLoader(files))
     parser.read('extend.ini')
     output = six.StringIO()
     parser.write(output)
@@ -199,11 +201,11 @@ kw6 = extend-kw6
 
   #----------------------------------------------------------------------------
   def test_output_order_descending(self):
-    files = [
-      ('base.ini', '[s3]\ns3v = b3\n[s2]\ns2v = b2\n[s1]\ns1v = b1\n'),
-      ('extend.ini', '[DEFAULT]\n%inherit = base.ini\n[s2]\ns2v = o2'),
-    ]
-    parser = ConfigParser(loader=ByteLoader(dict(files)))
+    files = {k: textwrap.dedent(v) for k, v in {
+      'base.ini' : '[s3]\ns3v = b3\n[s2]\ns2v = b2\n[s1]\ns1v = b1\n',
+      'extend.ini' : '[DEFAULT]\n%inherit = base.ini\n[s2]\ns2v = o2',
+    }.items()}
+    parser = ConfigParser(loader=ByteLoader(files))
     parser.read('extend.ini')
     output = six.StringIO()
     parser.write(output)
@@ -213,4 +215,5 @@ kw6 = extend-kw6
 
 #------------------------------------------------------------------------------
 # end of $Id$
+# $ChangeLog$
 #------------------------------------------------------------------------------