BIND 10 trac2157_2, updated. 36f21c21868230dc6dbf60b898607cca53fceaf4 [2157] Merge branch 'trac2157_2' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2157-2

[BIND 10 source code commits]

The branch, trac2157_2 has been updated
       via  36f21c21868230dc6dbf60b898607cca53fceaf4 (commit)
       via  9284859b4ab4af8670ecf1cd6de999a04cd4285b (commit)
      from  1e68893cbfb6d4742e1d9def9ca2960935c7e2b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 36f21c21868230dc6dbf60b898607cca53fceaf4
Merge: 9284859 1e68893
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Nov 28 20:00:47 2012 -0800

    [2157] Merge branch 'trac2157_2' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2157-2

commit 9284859b4ab4af8670ecf1cd6de999a04cd4285b
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Nov 28 20:00:00 2012 -0800

    [2157] editorial fixes: corrected typo; rm space for param spec; indent.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/auth/gen-statisticsitems.py.pre.in |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/gen-statisticsitems.py.pre.in b/src/bin/auth/gen-statisticsitems.py.pre.in
index 5908554..7ef4e1a 100755
--- a/src/bin/auth/gen-statisticsitems.py.pre.in
+++ b/src/bin/auth/gen-statisticsitems.py.pre.in
@@ -99,10 +99,10 @@ def import_definitions():
 
 def generate_specfile(specfile, def_mtime):
     '''Generate spec in specfile from skeleton (specfille+'.pre').
-    If the specfile is newer than both sleketon and def_mtime, file generation
+    If the specfile is newer than both skeleton and def_mtime, file generation
     will be skipped.
 
-    This method reads the content of skeleton and repaces
+    This method reads the content of skeleton and replaces
     <!-- ### STATISTICS DATA PLACEHOLDER ### --> with statistics items
     definition. LOCALSTATEDIR is also expanded.
 
@@ -110,7 +110,7 @@ def generate_specfile(specfile, def_mtime):
     '''
     global item_list
 
-    def convert_list(items, prefix = ''):
+    def convert_list(items, prefix=''):
         spec_list = []
         default_map = {}
         for item in items:
@@ -167,8 +167,8 @@ def generate_specfile(specfile, def_mtime):
                                                 localstatedir))
         stats_pre.close()
         stats_pre_json['module_spec']['statistics'] = statistics_spec_list
-        statistics_spec_json = json.dumps(stats_pre_json, sort_keys = True,
-                                          indent = 2)
+        statistics_spec_json = json.dumps(stats_pre_json, sort_keys=True,
+                                          indent=2)
         stats_spec = open(builddir+os.sep+specfile, 'w')
         stats_spec.write(statistics_spec_json)
         stats_spec.close()
@@ -178,10 +178,10 @@ def generate_specfile(specfile, def_mtime):
 
 def generate_docfile(docfile, def_mtime):
     '''Generate docbook XML in docfile from skeleton (docfile+'.pre').
-    If the docfile is newer than both sleketon and def_mtime, file generation
+    If the docfile is newer than both skeleton and def_mtime, file generation
     will be skipped.
 
-    This method reads the content of skeleton and repaces
+    This method reads the content of skeleton and replaces
     <!-- ### STATISTICS DATA PLACEHOLDER ### --> with statistics items
     definition. LOCALSTATEDIR is also expanded.
 
@@ -189,7 +189,7 @@ def generate_docfile(docfile, def_mtime):
     '''
     global item_list
 
-    def convert_list(items, tree, prefix = ''):
+    def convert_list(items, tree, prefix=''):
         for item in items:
             full_item_name = prefix + item['name']
             if item['child'] is None:
@@ -236,10 +236,10 @@ def generate_docfile(docfile, def_mtime):
 def generate_cxx(itemsfile, ccfile, utfile, def_mtime):
     '''Generate some part of statistics code in itemsfile, ccfile, utfile from
     skeleton (itemsfile+'.pre', ccfile+'.pre', utfile+'.pre').
-    If the file is newer than both sleketon and def_mtime, file generation
+    If the file is newer than both skeleton and def_mtime, file generation
     will be skipped.
 
-    This method reads the content of skeleton and repaces
+    This method reads the content of skeleton and replaces
     // ### STATISTICS ITEMS DEFINITION ### with statistics items definition in
     ccfile and utfile,
     // ### STATISTICS ITEMS DECLARATION ### with statistics items declaration
@@ -339,5 +339,5 @@ if __name__ == "__main__":
                      def_mtime)
     except:
         sys.stderr.write('File generation failed due to exception: %s\n' %
-                sys.exc_info()[1])
+                         sys.exc_info()[1])
         exit(1)