Skip to content

Commit be2882e

Browse files
More Travis warning fixes.
1 parent 31595ea commit be2882e

2 files changed

Lines changed: 12 additions & 13 deletions

File tree

resources/mame.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ def mame_compress_item_list(item_list):
350350
item_count = 1
351351
for i in range(1, num_items):
352352
current_item = item_list[i]
353-
# print('{0} | item_count {1} | previous_item "{2:>8}" | current_item "{3:>8}"'.format(i, item_count, previous_item, current_item))
353+
# log_debug('{0} | item_count {1} | previous_item "{2:>8}" | current_item "{3:>8}"'.format(i, item_count, previous_item, current_item))
354354
if current_item == previous_item:
355355
item_count += 1
356356
else:
@@ -3777,9 +3777,9 @@ def mame_build_MAME_main_database(PATHS, settings, control_dic, AML_version_str)
37773777
num_iteration = 0
37783778
for event, elem in context:
37793779
# --- Debug the elements we are iterating from the XML file ---
3780-
# print('Event {0:6s} | Elem.tag "{1}"'.format(event, elem.tag))
3781-
# print(' Elem.text "{0}"'.format(elem.text))
3782-
# print(' Elem.attrib "{0}"'.format(elem.attrib))
3780+
# log_debug('Event {0:6s} | Elem.tag "{1}"'.format(event, elem.tag))
3781+
# log_debug(' Elem.text "{0}"'.format(elem.text))
3782+
# log_debug(' Elem.attrib "{0}"'.format(elem.attrib))
37833783

37843784
# <machine> tag start event includes <machine> attributes
37853785
if event == 'start' and elem.tag == 'machine':
@@ -3810,7 +3810,7 @@ def mame_build_MAME_main_database(PATHS, settings, control_dic, AML_version_str)
38103810
# if raw_driver_name[-4:] == '.cpp':
38113811
# driver_name = raw_driver_name[0:-4]
38123812
# else:
3813-
# print('Unrecognised driver name "{0}"'.format(raw_driver_name))
3813+
# log_debug('Unrecognised driver name "{0}"'.format(raw_driver_name))
38143814

38153815
# >> Assign driver name
38163816
machine['sourcefile'] = raw_driver_name
@@ -4067,18 +4067,18 @@ def mame_build_MAME_main_database(PATHS, settings, control_dic, AML_version_str)
40674067
elif event == 'end' and elem.tag == 'machine':
40684068
# >> Assumption 1: isdevice = True if and only if runnable = False
40694069
if m_render['isDevice'] == runnable:
4070-
print("Machine {0}: machine['isDevice'] == runnable".format(m_name))
4070+
log_error("Machine {0}: machine['isDevice'] == runnable".format(m_name))
40714071
raise GeneralError
40724072

40734073
# >> Are there machines with more than 1 <display> tag. Answer: YES
40744074
# if num_displays > 1:
4075-
# print("Machine {0}: num_displays = {1}".format(m_name, num_displays))
4075+
# log_error("Machine {0}: num_displays = {1}".format(m_name, num_displays))
40764076
# raise GeneralError
40774077

4078-
# >> All machines with 0 displays are mechanical? NO, 24cdjuke has no screen and is not mechanical. However
4079-
# >> 24cdjuke is a preliminary driver.
4078+
# >> All machines with 0 displays are mechanical? NO, 24cdjuke has no screen and
4079+
# is not mechanical. However 24cdjuke is a preliminary driver.
40804080
# if num_displays == 0 and not machine['ismechanical']:
4081-
# print("Machine {0}: num_displays == 0 and not machine['ismechanical']".format(m_name))
4081+
# log_error("Machine {0}: num_displays == 0 and not machine['ismechanical']".format(m_name))
40824082
# raise GeneralError
40834083

40844084
# >> Mark dead machines. A machine is dead if Status is preliminary AND have no controls.
@@ -6110,7 +6110,7 @@ def _mame_load_SL_XML(xml_filename):
61106110
xml_root = xml_tree.getroot()
61116111
SLData['display_name'] = xml_root.attrib['description']
61126112
for root_element in xml_root:
6113-
if __debug_xml_parser: print('Root child {0}'.format(root_element.tag))
6113+
if __debug_xml_parser: log_debug('Root child {0}'.format(root_element.tag))
61146114

61156115
# >> Only process 'software' elements
61166116
if root_element.tag != 'software': continue
@@ -6128,7 +6128,7 @@ def _mame_load_SL_XML(xml_filename):
61286128
# >> By default read strings
61296129
xml_text = rom_child.text if rom_child.text is not None else ''
61306130
xml_tag = rom_child.tag
6131-
if __debug_xml_parser: print('{0} --> {1}'.format(xml_tag, xml_text))
6131+
if __debug_xml_parser: log_debug('{0} --> {1}'.format(xml_tag, xml_text))
61326132

61336133
# --- Only pick tags we want ---
61346134
if xml_tag == 'description' or xml_tag == 'year' or xml_tag == 'publisher':

resources/manuals.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
from PIL import Image
2929
PYTHON_PIL_AVAILABLE = True
3030
except:
31-
print('Exception importing PIL')
3231
PYTHON_PIL_AVAILABLE = False
3332

3433
# --- Kodi stuff ---

0 commit comments

Comments
 (0)