Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename variables id and type because they are builtin functions #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename variables id and type because they are builtin functions #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions fixaudit/fixaudit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@ def validate_repository(repository):
data_type_errors = []
for field in repository.fields_by_tag.values():
try:
data_type = repository.data_types[field.type]
data_type = repository.data_types[field.type_]
if data_type.base_type != None:
try:
base_type = repository.data_types[data_type.base_type]
except KeyError:
data_type_errors.append('data type {} has base type {} but there is no such data type defined'.format(data_type.name, data_type.base_type))
except KeyError:
data_type_errors.append('field tag={} has type={} but there is no such data type defined'.format(field.id, field.type))
data_type_errors.append('field tag={} has type={} but there is no such data type defined'.format(field.id_, field.type_))
if len(data_type_errors) == 0:
print('All data types referenced by fields are defined')
else:
Expand All @@ -127,13 +127,13 @@ def visit_orchestration_references(orchestration, references, context, field_err
if reference.group_id:
try:
group = orchestration.groups[reference.group_id]
visit_orchestration_references(orchestration, group.references, context + ' references group id={}'.format(group.id), field_errors, group_errors, component_errors)
visit_orchestration_references(orchestration, group.references, context + ' references group id={}'.format(group.id_), field_errors, group_errors, component_errors)
except KeyError:
group_errors.append('{} that references group id={} that is not defined'.format(context, reference.group_id))
if reference.component_id:
try:
component = orchestration.components[reference.component_id]
visit_orchestration_references(orchestration, component.references, context + 'references component id={}'.format(component.id), field_errors, group_errors, component_errors)
visit_orchestration_references(orchestration, component.references, context + 'references component id={}'.format(component.id_), field_errors, group_errors, component_errors)
except KeyError:
component_errors.append('{} that references component id={} that is not defined'.format(context, reference.component_id))

Expand All @@ -147,17 +147,17 @@ def validate_orchestration(orchestration):
component_errors = []
for field in orchestration.fields_by_tag.values():
try:
data_type = orchestration.data_types[field.type]
data_type = orchestration.data_types[field.type_]
if data_type.base_type != None:
try:
base_type = orchestration.data_types[data_type.base_type]
except KeyError:
data_type_errors.append('data type {} has base type {} but there is no such data type defined'.format(data_type.name, data_type.base_type))
except KeyError:
try:
code_set = orchestration.code_sets[field.type]
code_set = orchestration.code_sets[field.type_]
except KeyError:
data_type_errors.append('field tag={} has type={} but there is no such data type or code set defined'.format(field.id, field.type))
data_type_errors.append('field tag={} has type={} but there is no such data type or code set defined'.format(field.id_, field.type_))
for message in orchestration.messages.values():
visit_orchestration_references(orchestration, message.references, 'message MsgType={}'.format(message.msg_type), field_errors, group_errors, component_errors)

Expand Down
86 changes: 43 additions & 43 deletions fixorchestra/orchestration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ class Code:
# This class needs to be kept in sync with repository.Enum because fixaudit.py stores
# instances of these classes in Sets. Specifically both implementations have to be hashable
# and they have to be hashing the same thing.
def __init__(self, id, name, value, synopsis, pedigree):
self.id = id
def __init__(self, id_, name, value, synopsis, pedigree):
self.id_ = id_
self.name = name
self.value = value
self.synopsis = synopsis
Expand All @@ -89,10 +89,10 @@ def __eq__(self, rhs):

class CodeSet:

def __init__(self, id, name, type, synopsis, pedigree, codes):
self.id = id
def __init__(self, id_, name, type_, synopsis, pedigree, codes):
self.id_ = id_
self.name = name
self.type = type
self.type_ = type_
self.synopsis = synopsis
self.pedigree = pedigree
self.codes = codes
Expand All @@ -101,18 +101,18 @@ class Field:
# This class needs to be kept in sync with repository.Field because fixaudit.py stores
# nstances of these classes in Sets. Specifically both implementations have to be hashable
# and they have to be hashing the same thing.
def __init__(self, id, name, type, synopsis, pedigree):
self.id = id
def __init__(self, id_, name, type_, synopsis, pedigree):
self.id_ = id_
self.name = name
self.type = type
self.type_ = type_
self.synopsis = synopsis
self.pedigree = pedigree

def __hash__(self):
return hash(self.id)
return hash(self.id_)

def __eq__(self, rhs):
return self.id == rhs.id
return self.id_ == rhs.id_


class Reference:
Expand All @@ -129,8 +129,8 @@ def __init__(self, field_id, group_id, component_id, presence, synopsis, pedigre

class Component:

def __init__(self, id, name, category, synopsis, pedigree, references):
self.id = id
def __init__(self, id_, name, category, synopsis, pedigree, references):
self.id_ = id_
self.name = name
self.category = category
self.synopsis = synopsis
Expand All @@ -139,8 +139,8 @@ def __init__(self, id, name, category, synopsis, pedigree, references):

class Group:

def __init__(self, id, name, category, synopsis, pedigree, references):
self.id = id
def __init__(self, id_, name, category, synopsis, pedigree, references):
self.id_ = id_
self.name = name
self.category = category
self.synopsis = synopsis
Expand All @@ -149,8 +149,8 @@ def __init__(self, id, name, category, synopsis, pedigree, references):

class Message:

def __init__(self, id, name, msg_type, category, synopsis, pedigree, references):
self.id = id
def __init__(self, id_, name, msg_type, category, synopsis, pedigree, references):
self.id_ = id_
self.name = name
self.msg_type = msg_type
self.category = category
Expand All @@ -171,11 +171,11 @@ class Orchestration:

data_types = {} # DataType.name -> DataType
code_sets = {} # CodeSet.name -> CodeSet
fields_by_tag = {} # Field.id -> Field
fields_by_tag = {} # Field.id_ -> Field
fields_by_name = {} # Field.name.lower() -> Field
components = {} # Componnet.id -> Component
groups = {} # Group.id -> Group
messages = {} # Message.id -> Message
components = {} # Componnet.id_ -> Component
groups = {} # Group.id_ -> Group
messages = {} # Message.id_ -> Message
messages_by_msg_type = {} # Message.msg_type -> Message
messages_by_name = {} # Message.name.lower() -> Message
version = ''
Expand Down Expand Up @@ -214,7 +214,7 @@ def message_fields(self, message):

def field_values(self, field):
try:
return self.code_sets[field.type].codes
return self.code_sets[field.type_].codes
except KeyError:
return []

Expand Down Expand Up @@ -324,7 +324,7 @@ def load_fields(self, repository):
self.extract_synopsis(fieldElement),
self.extract_pedigree(fieldElement)
)
self.fields_by_tag[field.id] = field
self.fields_by_tag[field.id_] = field
self.fields_by_name[field.name.lower()] = field


Expand Down Expand Up @@ -388,7 +388,7 @@ def load_components(self, repository):
self.extract_pedigree(componentElement),
self.extract_references(componentElement)
)
self.components[component.id] = component
self.components[component.id_] = component

def load_groups(self, repository):
# <fixr:groups>
Expand Down Expand Up @@ -420,7 +420,7 @@ def load_groups(self, repository):
self.extract_pedigree(groupElement),
self.extract_references(groupElement)
)
self.groups[group.id] = group
self.groups[group.id_] = group


def load_messages(self, repository):
Expand All @@ -446,7 +446,7 @@ def load_messages(self, repository):
self.extract_pedigree(messageElement),
self.extract_references(structureElement)
)
self.messages[message.id] = message
self.messages[message.id_] = message
self.messages_by_msg_type[message.msg_type] = message
self.messages_by_name[message.name.lower()] = message

Expand Down Expand Up @@ -520,10 +520,10 @@ def create_xml_code_sets(self, root):
# </fixr:code>
code_sets = ET.SubElement(root, '{%s}codeSets' % (fixr_namespace))
for source in self.code_sets.values():
code_set = ET.SubElement(code_sets, '{%s}codeSet' % (fixr_namespace), name=source.name, id=str(source.id), type=source.type)
code_set = ET.SubElement(code_sets, '{%s}codeSet' % (fixr_namespace), name=source.name, id=str(source.id_), type=source.type_)
for source_code in source.codes:
# TODO sort attribute
code = ET.SubElement(code_set, '{%s}code' % (fixr_namespace), name=source_code.name, id=str(source_code.id), value=source_code.value)
code = ET.SubElement(code_set, '{%s}code' % (fixr_namespace), name=source_code.name, id=str(source_code.id_), value=source_code.value)
self.populate_xml_pedigree(code, source.pedigree)
annotation = ET.SubElement(code, '{%s}annotation' % (fixr_namespace))
ET.SubElement(annotation, '{%s}documentation' % (fixr_namespace), purpose='SYNOPSIS').text = source_code.synopsis
Expand All @@ -544,7 +544,7 @@ def create_xml_fields(self, root):
fields = ET.SubElement(root, '{%s}fields' % (fixr_namespace))
for source in self.fields_by_tag.values():
# TODO abbrName
field = ET.SubElement(fields, '{%s}field' % (fixr_namespace), id=str(source.id), name=source.name, type=source.type)
field = ET.SubElement(fields, '{%s}field' % (fixr_namespace), id=str(source.id_), name=source.name, type=source.type_)
self.populate_xml_pedigree(field, source.pedigree)
annotation = ET.SubElement(field, '{%s}annotation' % (fixr_namespace))
if source.synopsis:
Expand Down Expand Up @@ -605,7 +605,7 @@ def create_xml_components(self, root):
components = ET.SubElement(root, '{%s}components' % (fixr_namespace))
for source in self.components.values():
# TODO abbrName
component = ET.SubElement(components, '{%s}component' % (fixr_namespace), name=source.name, id=str(source.id), category=source.category)
component = ET.SubElement(components, '{%s}component' % (fixr_namespace), name=source.name, id=str(source.id_), category=source.category)
self.populate_xml_pedigree(component, source.pedigree)
self.create_xml_references(component, source.references)
if source.synopsis:
Expand Down Expand Up @@ -635,7 +635,7 @@ def create_xml_groups(self, root):
# </fixr:group>
groups = ET.SubElement(root, '{%s}groups' % (fixr_namespace))
for source in self.groups.values():
group = ET.SubElement(groups, '{%s}group' % (fixr_namespace), id=str(source.id), name=source.name, category=source.category)
group = ET.SubElement(groups, '{%s}group' % (fixr_namespace), id=str(source.id_), name=source.name, category=source.category)
# TODO - numInGroup
self.populate_xml_pedigree(group, source.pedigree)
self.create_xml_references(group, source.references)
Expand All @@ -662,7 +662,7 @@ def create_xml_messages(self, root):
messages = ET.SubElement(root, '{%s}messages' % (fixr_namespace))
for source in self.messages_by_msg_type.values():
# TODO abbrName
message = ET.SubElement(messages, '{%s}message' % (fixr_namespace), name=source.name, id=str(source.id), msgType=source.msg_type, category=source.category)
message = ET.SubElement(messages, '{%s}message' % (fixr_namespace), name=source.name, id=str(source.id_), msgType=source.msg_type, category=source.category)
self.populate_xml_pedigree(message, source.pedigree)
structure = ET.SubElement(message, '{%s}structure' % (fixr_namespace))
self.create_xml_references(structure, source.references)
Expand Down Expand Up @@ -704,12 +704,12 @@ def dump_field(orchestration, tag_or_name):
print("Could not find a field with Tag or Name = '{}'".format(tag_or_name))
return
print(field.name + " {")
print(" Id = " + str(field.id))
print(" Type = " + field.type)
print(" Id = " + str(field.id_))
print(" Type = " + field.type_)
print(" Pedigree = " + str(field.pedigree))
print(" (" + field.synopsis + ")")
try:
code_set = orchestration.code_sets[field.type]
code_set = orchestration.code_sets[field.type_]
print(" Values {")
for code in code_set.codes:
name = code.name
Expand All @@ -725,15 +725,15 @@ def dump_references(orchestration, references, depth):
for reference in references:
if reference.field_id:
field = orchestration.fields_by_tag[reference.field_id]
print(padding + '{} (Id = {}, Type = {}, Pedigree = {}, Presence = {})'.format(field.name, field.id, field.type, str(field.pedigree), reference.presence))
print(padding + '{} (Id = {}, Type = {}, Pedigree = {}, Presence = {})'.format(field.name, field.id_, field.type_, str(field.pedigree), reference.presence))
elif reference.group_id:
group = orchestration.groups[reference.group_id]
print(padding + group.name + " (Id = {}, Category = {}, Pedigree = {}, Presence = {}) {{".format(group.id, group.category, str(group.pedigree), reference.presence))
print(padding + group.name + " (Id = {}, Category = {}, Pedigree = {}, Presence = {}) {{".format(group.id_, group.category, str(group.pedigree), reference.presence))
dump_references(orchestration, group.references, depth + 1)
print(padding + "}")
elif reference.component_id:
component = orchestration.components[reference.component_id]
print(padding + component.name + " (Id = {}, Category = {}, Pedigree = {}, Presence = {}) {{".format(component.id, component.category, str(component.pedigree), reference.presence))
print(padding + component.name + " (Id = {}, Category = {}, Pedigree = {}, Presence = {}) {{".format(component.id_, component.category, str(component.pedigree), reference.presence))
dump_references(orchestration, component.references, depth + 1)
print(padding + "}")

Expand All @@ -748,7 +748,7 @@ def dump_message(orchestration, msg_type_or_name):
print("Could not find a message with MsgType or Name = '{}'".format(msg_type_or_name))
return
print(message.name + " {")
print(" Id = " + message.id)
print(" Id = " + message.id_)
print(" MsgType = " + message.msg_type)
print(" Category = " + message.category)
print(" Pedigree = " + str(message.pedigree))
Expand All @@ -766,26 +766,26 @@ def list_messages(orchestration):

def list_fields(orchestration):
for field in orchestration.fields_by_tag.values():
print('{}\t{} ({})'.format(field.id, field.name, field.type))
print('{}\t{} ({})'.format(field.id_, field.name, field.type_))


def list_enumerated_fields(orchestration):
for field in orchestration.fields_by_tag.values():
try:
_ = orchestration.code_sets[field.type]
print('{}\t{} ({})'.format(field.id, field.name, field.type))
_ = orchestration.code_sets[field.type_]
print('{}\t{} ({})'.format(field.id_, field.name, field.type_))
except KeyError:
pass


def list_groups(orchestration):
for group in orchestration.groups.values():
print('{} (Id={}, Category={}, Pedigree={})'.format(group.name, group.id, group.category, group.pedigree))
print('{} (Id={}, Category={}, Pedigree={})'.format(group.name, group.id_, group.category, group.pedigree))


def list_components(repository):
for component in repository.components.values():
print('{} (Id={})'.format(component.name, component.id))
print('{} (Id={})'.format(component.name, component.id_))


def main():
Expand Down
Loading