From 57de5f34a2f3159908c276fd6969c4e6d3f7bcff Mon Sep 17 00:00:00 2001
From: Bruno Nocera Zanette <brunonzanette@gmail.com>
Date: Thu, 19 Sep 2013 14:01:55 -0300
Subject: [PATCH] Change Variable names to avoid confusion
The names of indentation control variables were a bit ambiguous, so they
were changed to avoid confusion.
Signed-off-by: Bruno Nocera Zanette <brunonzanette@gmail.com>
---
lib/opendata_json_class.py | 28 ++++++++++++++--------------
lib/opendata_xml_class.py | 26 +++++++++++++-------------
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/lib/opendata_json_class.py b/lib/opendata_json_class.py
index bffae1c..f46c41d 100644
--- a/lib/opendata_json_class.py
+++ b/lib/opendata_json_class.py
@@ -32,8 +32,8 @@ import opendata_queries_definition as qry
class OpendataJSON:
database = None
- indentation = None
- level = None
+ indentation_lvl = None
+ indent = None
dir_results = None
filename = None
out_file = None
@@ -42,17 +42,17 @@ class OpendataJSON:
def __init__ (self, database, dir_results, filename):
self.database = database
- self.indentation = 0
- self.level = strf.lvl(self.indentation)
+ self.indentation_lvl = 0
+ self.indent = strf.lvl(self.indentation_lvl)
self.dir_results = dir_results
self.filename = filename
#--------------------------------------------------------------------#
#--------------------------------------------------------------------#
- def update_indentation(self, increment):
- self.indentation=self.indentation+(increment)
- self.level = strf.lvl(self.indentation)
+ def update_indentation_lvl(self, increment):
+ self.indentation_lvl=self.indentation_lvl+(increment)
+ self.indent = strf.lvl(self.indentation_lvl)
#--------------------------------------------------------------------#
#--------------------------------------------------------------------#
@@ -68,26 +68,26 @@ class OpendataJSON:
#--------------------------------------------------------------------#
def write_open_tag (self, tag_name, sep):
if len(tag_name) > 0:
- self.out_file.write(self.level+"\""+tag_name+"\""+":"+sep+"\n")
+ self.out_file.write(self.indent+"\""+tag_name+"\""+":"+sep+"\n")
else:
- self.out_file.write(self.level+sep+"\n")
- self.update_indentation(+1)
+ self.out_file.write(self.indent+sep+"\n")
+ self.update_indentation_lvl(+1)
#--------------------------------------------------------------------#
#--------------------------------------------------------------------#
def write_close_tag (self, sep, comma_flag):
- self.update_indentation(-1)
+ self.update_indentation_lvl(-1)
if comma_flag == True:
- self.out_file.write(self.level+sep+","+"\n")
+ self.out_file.write(self.indent+sep+","+"\n")
else:
- self.out_file.write(self.level+sep+"\n")
+ self.out_file.write(self.indent+sep+"\n")
#--------------------------------------------------------------------#
#--------------------------------------------------------------------#
def write_tag (self, tag_name, info_str, comma):
name="\""+tag_name+"\""
info="\""+strf.substbadc(info_str)+"\""
- self.out_file.write(self.level+name+":"+info+comma+"\n")
+ self.out_file.write(self.indent+name+":"+info+comma+"\n")
#--------------------------------------------------------------------#
#--------------------------------------------------------------------#
diff --git a/lib/opendata_xml_class.py b/lib/opendata_xml_class.py
index f39ea37..0817786 100644
--- a/lib/opendata_xml_class.py
+++ b/lib/opendata_xml_class.py
@@ -31,8 +31,8 @@ import opendata_queries_definition as qry
class OpendataXML:
database = None
- indentation = None
- level = None
+ indentation_lvl = None
+ indent = None
dir_results = None
filename = None
out_file = None
@@ -41,17 +41,17 @@ class OpendataXML:
def __init__ (self, database, dir_results, filename):
self.database = database
- self.indentation = 0
- self.level = strf.lvl(self.indentation)
+ self.indentation_lvl = 0
+ self.indent = strf.lvl(self.indentation_lvl)
self.dir_results = dir_results
self.filename = filename
#--------------------------------------------------------------------#
#--------------------------------------------------------------------#
- def update_indentation(self, increment):
- self.indentation=self.indentation+(increment)
- self.level = strf.lvl(self.indentation)
+ def update_indentation_lvl(self, increment):
+ self.indentation_lvl=self.indentation_lvl+(increment)
+ self.indent = strf.lvl(self.indentation_lvl)
#--------------------------------------------------------------------#
#--------------------------------------------------------------------#
@@ -67,14 +67,14 @@ class OpendataXML:
#--------------------------------------------------------------------#
def write_open_tag (self, tag_name, attr_str):
- self.out_file.write(self.level+"<"+tag_name+attr_str+">"+"\n")
- self.update_indentation(+1)
+ self.out_file.write(self.indent+"<"+tag_name+attr_str+">"+"\n")
+ self.update_indentation_lvl(+1)
#--------------------------------------------------------------------#
#--------------------------------------------------------------------#
def write_close_tag (self, tag_name):
- self.update_indentation(-1)
- self.out_file.write(self.level+"</"+tag_name+">"+"\n")
+ self.update_indentation_lvl(-1)
+ self.out_file.write(self.indent+"</"+tag_name+">"+"\n")
#--------------------------------------------------------------------#
#--------------------------------------------------------------------#
@@ -82,9 +82,9 @@ class OpendataXML:
if len(info_str) > 0:
tag_begin=("<"+tag_name+attr_str+">")
tag_end=("</"+tag_name+">")
- self.out_file.write(self.level+tag_begin+info_str+tag_end+"\n")
+ self.out_file.write(self.indent+tag_begin+info_str+tag_end+"\n")
else:
- self.out_file.write(self.level+"<"+tag_name+attr_str+"/>"+"\n")
+ self.out_file.write(self.indent+"<"+tag_name+attr_str+"/>"+"\n")
#--------------------------------------------------------------------#
#--------------------------------------------------------------------#
--
GitLab