Merge pull request #4529 from bcoca/warns_no_conflict

fixed name colision between warnings dict and module
pull/4530/merge
jctanner 11 years ago
commit 33faaaa9a0

@ -47,7 +47,7 @@ VERBOSITY=0
# list of all deprecation messages to prevent duplicate display # list of all deprecation messages to prevent duplicate display
deprecations = {} deprecations = {}
warnings = {} warns = {}
MAX_FILE_SIZE_FOR_DIFF=1*1024*1024 MAX_FILE_SIZE_FOR_DIFF=1*1024*1024
@ -990,9 +990,9 @@ def warning(msg):
new_msg = "\n[WARNING]: %s" % msg new_msg = "\n[WARNING]: %s" % msg
wrapped = textwrap.wrap(new_msg, 79) wrapped = textwrap.wrap(new_msg, 79)
new_msg = "\n".join(wrapped) + "\n" new_msg = "\n".join(wrapped) + "\n"
if new_msg not in warnings: if new_msg not in warns:
display(new_msg, color='bright purple', stderr=True) display(new_msg, color='bright purple', stderr=True)
warnings[new_msg] = 1 warns[new_msg] = 1
def combine_vars(a, b): def combine_vars(a, b):

Loading…
Cancel
Save