Skip to content

Back out the changes that should not have been committed to master #9

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

Merged
merged 3 commits into from
Oct 19, 2017
Merged

Back out the changes that should not have been committed to master #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3967b0c
Merge pull request #1 from xtuml/master
keithbrown Aug 3, 2017
caea5e6
Merge remote-tracking branch 'xtuml/master'
keithbrown Oct 16, 2017
5688302
Back out the changes that were accidentally committed to master in 64…
keithbrown Oct 19, 2017
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
21 changes: 7 additions & 14 deletions xtuml/load.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,6 @@ class ModelLoader(object):
lexer = None
statements = None

quietInsertMismatch = False

def __init__(self):
self.statements = list()
self.parser = yacc.yacc(debuglog=logger,
Expand All @@ -213,9 +211,6 @@ def __init__(self):
outputdir=os.path.dirname(__file__),
tabmodule='xtuml.__xtuml_parsetab')

def dontWarnInsertMismatch(self):
self.quietInsertMismatch = True

def input(self, data, name='<string>'):
'''
Parse *data* directly from a string. The *name* is used when reporting
Expand Down Expand Up @@ -301,7 +296,7 @@ def _populate_matching_class(metamodel, kind, names, values):
return metamodel.define_class(kind, attributes)

@staticmethod
def _populate_instance_with_positional_arguments(metamodel, stmt, quietInsertMismatchWarning):
def _populate_instance_with_positional_arguments(metamodel, stmt):
'''
Populate a *metamodel* with an instance previously encountered from
input that was defined using positional arguments.
Expand All @@ -312,9 +307,8 @@ def _populate_instance_with_positional_arguments(metamodel, stmt, quietInsertMis
names, stmt.values)

metaclass = metamodel.find_metaclass(stmt.kind)
if not quietInsertMismatchWarning:
if len(metaclass.attributes) != len(stmt.values):
logger.warn('%s:%d:schema mismatch' % (stmt.filename, stmt.lineno))
if len(metaclass.attributes) != len(stmt.values):
logger.warn('%s:%d:schema mismatch' % (stmt.filename, stmt.lineno))

inst = metamodel.new(stmt.kind)
for attr, value in zip(metaclass.attributes, stmt.values):
Expand All @@ -332,7 +326,7 @@ def _populate_instance_with_positional_arguments(metamodel, stmt, quietInsertMis
return inst

@staticmethod
def _populate_instance_with_named_arguments(metamodel, stmt, quietInsertMismatchWarning):
def _populate_instance_with_named_arguments(metamodel, stmt):
'''
Populate a *metamodel* with an instance previously encountered from
input that was defined using named arguments.
Expand All @@ -346,9 +340,8 @@ def _populate_instance_with_named_arguments(metamodel, stmt, quietInsertMismatch
schema_unames = [name.upper() for name in metaclass.attribute_names]
inst_unames = [name.upper() for name in stmt.names]

if not quietInsertMismatchWarning:
if set(inst_unames) - set(schema_unames):
logger.warn('%s:%d:schema mismatch' % (stmt.filename, stmt.lineno))
if set(inst_unames) - set(schema_unames):
logger.warn('%s:%d:schema mismatch' % (stmt.filename, stmt.lineno))

inst = metamodel.new(stmt.kind)
for name, ty in metaclass.attributes:
Expand Down Expand Up @@ -383,7 +376,7 @@ def populate_instances(self, metamodel):
else:
fn = self._populate_instance_with_positional_arguments

fn(metamodel, stmt, self.quietInsertMismatch)
fn(metamodel, stmt)

def populate_connections(self, metamodel):
'''
Expand Down