Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-16 13:34:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

-Don't use image_error::BADSOFTWARE for things that aren't software list errors.

Browse Source 
-scripts/minimaws: Use python3 superclass method call syntax.
This commit is contained in:
Vas Crabb 2024-09-19 02:02:16 +10:00
parent 608499617a
commit e5b401ef36
10 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/minimaws/lib/auxverbs.py
View File

@ -17,7 +17,7 @@ import zlib
class _Identifier(object):
def __init__(self, dbcurs, **kwargs):
super(_Identifier, self).__init__(**kwargs)
super().__init__(**kwargs)
self.dbcurs = dbcurs
self.shortnamewidth = 0
self.pathwidth = 0

8
scripts/minimaws/lib/dbaccess.py
View File

@ -571,7 +571,7 @@ class UpdateQueries(object):
class QueryCursor(object):
def __init__(self, dbconn, **kwargs):
super(QueryCursor, self).__init__(**kwargs)
super().__init__(**kwargs)
self.dbcurs = dbconn.cursor()
def close(self):
@ -913,7 +913,7 @@ class QueryCursor(object):
class UpdateCursor(object):
def __init__(self, dbconn, **kwargs):
super(UpdateCursor, self).__init__(**kwargs)
super().__init__(**kwargs)
self.dbcurs = dbconn.cursor()
def close(self):
@ -1063,7 +1063,7 @@ class UpdateCursor(object):
class QueryConnection(object):
def __init__(self, database, **kwargs):
super(QueryConnection, self).__init__(**kwargs)
super().__init__(**kwargs)
self.dbconn = sqlite3.connect('file:' + urllib.request.pathname2url(database) + '?mode=ro', uri=True, check_same_thread=False)
self.dbconn.row_factory = sqlite3.Row
self.dbconn.execute('PRAGMA foreign_keys = ON')
@ -1077,7 +1077,7 @@ class QueryConnection(object):
class UpdateConnection(object):
def __init__(self, database, **kwargs):
super(UpdateConnection, self).__init__(**kwargs)
super().__init__(**kwargs)
self.dbconn = sqlite3.connect(database)
self.dbconn.execute('PRAGMA page_size = 4096')
self.dbconn.execute('PRAGMA foreign_keys = ON')

24
scripts/minimaws/lib/lxparse.py
View File

@ -14,7 +14,7 @@ import xml.sax.saxutils
class ElementHandlerBase(object):
def __init__(self, parent, **kwargs):
super(ElementHandlerBase, self).__init__(**kwargs)
super().__init__(**kwargs)
self.dbconn = parent.dbconn if parent is not None else None
self.locator = parent.locator if parent is not None else None
self.depth = 0
@ -105,7 +105,7 @@ class ElementHandler(ElementHandlerBase):
class TextAccumulator(ElementHandler):
def __init__(self, parent, **kwargs):
super(TextAccumulator, self).__init__(parent=parent, **kwargs)
super().__init__(parent=parent, **kwargs)
self.text = ''
def mainCharacters(self, content):
@ -114,7 +114,7 @@ class TextAccumulator(ElementHandler):
class DipSwitchHandler(ElementHandler):
def __init__(self, parent, **kwargs):
super(DipSwitchHandler, self).__init__(parent=parent, **kwargs)
super().__init__(parent=parent, **kwargs)
self.dbcurs = parent.dbcurs
self.machine = parent.id
@ -138,7 +138,7 @@ class DipSwitchHandler(ElementHandler):
class SlotHandler(ElementHandler):
def __init__(self, parent, **kwargs):
super(SlotHandler, self).__init__(parent=parent, **kwargs)
super().__init__(parent=parent, **kwargs)
self.dbcurs = parent.dbcurs
self.machine = parent.id
@ -155,7 +155,7 @@ class SlotHandler(ElementHandler):
class RamOptionHandler(TextAccumulator):
def __init__(self, parent, **kwargs):
super(RamOptionHandler, self).__init__(parent=parent, **kwargs)
super().__init__(parent=parent, **kwargs)
self.dbcurs = parent.dbcurs
self.machine = parent.id
@ -181,7 +181,7 @@ class MachineHandler(ElementHandler):
'ramoption': RamOptionHandler }
def __init__(self, parent, **kwargs):
super(MachineHandler, self).__init__(parent=parent, **kwargs)
super().__init__(parent=parent, **kwargs)
self.dbcurs = self.dbconn.cursor()
def startMainElement(self, name, attrs):
@ -248,7 +248,7 @@ class MachineHandler(ElementHandler):
class ListXmlHandler(ElementHandler):
def __init__(self, dbconn, **kwargs):
super(ListXmlHandler, self).__init__(parent=None, **kwargs)
super().__init__(parent=None, **kwargs)
self.dbconn = dbconn
def startDocument(self):
@ -290,7 +290,7 @@ class ListXmlHandler(ElementHandler):
class DataAreaHandler(ElementHandler):
def __init__(self, parent, **kwargs):
super(DataAreaHandler, self).__init__(parent=parent, **kwargs)
super().__init__(parent=parent, **kwargs)
self.dbcurs = parent.dbcurs
self.part = parent.id
@ -309,7 +309,7 @@ class DataAreaHandler(ElementHandler):
class DiskAreaHandler(ElementHandler):
def __init__(self, parent, **kwargs):
super(DiskAreaHandler, self).__init__(parent=parent, **kwargs)
super().__init__(parent=parent, **kwargs)
self.dbcurs = parent.dbcurs
self.part = parent.id
@ -330,7 +330,7 @@ class SoftwarePartHandler(ElementHandler):
'diskarea': DiskAreaHandler }
def __init__(self, parent, **kwargs):
super(SoftwarePartHandler, self).__init__(parent=parent, **kwargs)
super().__init__(parent=parent, **kwargs)
self.dbcurs = parent.dbcurs
self.software = parent.id
@ -356,7 +356,7 @@ class SoftwareHandler(ElementHandler):
'part': SoftwarePartHandler }
def __init__(self, parent, **kwargs):
super(SoftwareHandler, self).__init__(parent=parent, **kwargs)
super().__init__(parent=parent, **kwargs)
self.dbcurs = self.dbconn.cursor()
self.softwarelist = parent.id
@ -400,7 +400,7 @@ class SoftwareListHandler(ElementHandler):
'software': SoftwareHandler }
def __init__(self, dbconn, **kwargs):
super(SoftwareListHandler, self).__init__(parent=None, **kwargs)
super().__init__(parent=None, **kwargs)
self.dbconn = dbconn
def startDocument(self):

24
scripts/minimaws/lib/wsgiserve.py
View File

@ -39,7 +39,7 @@ class HandlerBase(object):
505: 'HTTP Version Not Supported' }
def __init__(self, app, application_uri, environ, start_response, **kwargs):
super(HandlerBase, self).__init__(**kwargs)
super().__init__(**kwargs)
self.app = app
self.js_escape = app.js_escape
self.application_uri = application_uri
@ -52,7 +52,7 @@ class HandlerBase(object):
class ErrorPageHandler(HandlerBase):
def __init__(self, code, app, application_uri, environ, start_response, **kwargs):
super(ErrorPageHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
self.code = code
self.start_response('%d %s' % (self.code, self.STATUS_MESSAGE[code]), [('Content-type', 'text/html; charset=utf-8'), ('Cache-Control', 'public, max-age=3600')])
@ -64,7 +64,7 @@ class AssetHandler(HandlerBase):
EXTENSIONMAP = { '.js': 'application/javascript', '.svg': 'image/svg+xml' }
def __init__(self, directory, app, application_uri, environ, start_response, **kwargs):
super(AssetHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
self.directory = directory
self.asset = shiftpath(environ)
@ -99,7 +99,7 @@ class AssetHandler(HandlerBase):
class QueryPageHandler(HandlerBase):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
super(QueryPageHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
self.dbcurs = app.dbconn.cursor()
def machine_href(self, shortname):
@ -191,7 +191,7 @@ class QueryPageHandler(HandlerBase):
class MachineRpcHandlerBase(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
super(MachineRpcHandlerBase, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
self.shortname = shiftpath(environ)
def __iter__(self):
@ -216,7 +216,7 @@ class MachineRpcHandlerBase(QueryPageHandler):
class MachineHandler(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
super(MachineHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
self.shortname = shiftpath(environ)
def __iter__(self):
@ -464,7 +464,7 @@ class MachineHandler(QueryPageHandler):
class SourceFileHandler(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
super(SourceFileHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
def __iter__(self):
self.filename = self.environ['PATH_INFO']
@ -577,7 +577,7 @@ class SourceFileHandler(QueryPageHandler):
class SoftwareListHandler(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
super(SoftwareListHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
self.shortname = shiftpath(environ)
self.software = shiftpath(environ)
@ -788,7 +788,7 @@ class SoftwareListHandler(QueryPageHandler):
class RomIdentHandler(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
super(QueryPageHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
self.dbcurs = app.dbconn.cursor()
def __iter__(self):
@ -833,7 +833,7 @@ class SoftwareListsRpcHandler(MachineRpcHandlerBase):
class RomDumpsRpcHandler(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
super(RomDumpsRpcHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
def __iter__(self):
if self.environ['PATH_INFO']:
@ -890,7 +890,7 @@ class RomDumpsRpcHandler(QueryPageHandler):
class DiskDumpsRpcHandler(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
super(DiskDumpsRpcHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
def __iter__(self):
if self.environ['PATH_INFO']:
@ -954,7 +954,7 @@ class MiniMawsApp(object):
'diskdumps': DiskDumpsRpcHandler }
def __init__(self, dbfile, **kwargs):
super(MiniMawsApp, self).__init__(**kwargs)
super().__init__(**kwargs)
self.dbconn = dbaccess.QueryConnection(dbfile)
self.assetsdir = os.path.join(os.path.dirname(inspect.getfile(self.__class__)), 'assets')
if not mimetypes.inited:

2
src/mame/altos/altos5.cpp
View File

@ -323,7 +323,7 @@ QUICKLOAD_LOAD_MEMBER(altos5_state::quickload_cb)
{
uint8_t data;
if (image.fread(&data, 1) != 1)
return std::make_pair(image_error::BADSOFTWARE, "Problem reading the image at offset " + std::to_string(i));
return std::make_pair(image_error::UNSPECIFIED, "Problem reading the image at offset " + std::to_string(i));
prog_space.write_byte(i + 0x100, data);
}

2
src/mame/ausnz/aussiebyte.cpp
View File

@ -423,7 +423,7 @@ QUICKLOAD_LOAD_MEMBER(aussiebyte_state::quickload_cb)
{
u8 data;
if (image.fread(&data, 1) != 1)
return std::make_pair(image_error::BADSOFTWARE, "Problem reading the image at offset " + std::to_string(i));
return std::make_pair(image_error::UNSPECIFIED, "Problem reading the image at offset " + std::to_string(i));
prog_space.write_byte(i + 0x100, data);
}

2
src/mame/kaypro/kaypro_m.cpp
View File

@ -315,7 +315,7 @@ QUICKLOAD_LOAD_MEMBER(kaypro_state::quickload_cb)
{
u8 data;
if (image.fread(&data, 1) != 1)
return std::make_pair(image_error::BADSOFTWARE, "Problem reading the image at offset " + std::to_string(i));
return std::make_pair(image_error::UNSPECIFIED, "Problem reading the image at offset " + std::to_string(i));
prog_space.write_byte(i + 0x100, data);
}

2
src/mame/ncr/dmv.cpp
View File

@ -416,7 +416,7 @@ QUICKLOAD_LOAD_MEMBER(dmv_state::quickload_cb)
{
uint8_t data;
if (image.fread(&data, 1) != 1)
return std::make_pair(image_error::BADSOFTWARE, "Problem reading the image at offset " + std::to_string(i));
return std::make_pair(image_error::UNSPECIFIED, "Problem reading the image at offset " + std::to_string(i));
m_ram->base()[i + 0x100] = data;
}

4
src/mame/sony/smc777.cpp
View File

@ -437,11 +437,11 @@ QUICKLOAD_LOAD_MEMBER(smc777_state::quickload_cb)
{
uint8_t data;
if (image.fread(&data, 1) != 1)
return std::make_pair(image_error::BADSOFTWARE, "Problem reading the image at offset " + std::to_string(i));
return std::make_pair(image_error::UNSPECIFIED, "Problem reading the image at offset " + std::to_string(i));
prog_space.write_byte(i + 0x100, data);
}
// clear out command tail */
// clear out command tail
prog_space.write_byte(0x80, 0);
prog_space.write_byte(0x81, 0);

4
src/mame/xerox/xerox820.cpp
View File

@ -401,11 +401,11 @@ QUICKLOAD_LOAD_MEMBER(xerox820_state::quickload_cb)
{
uint8_t data;
if (image.fread(&data, 1) != 1)
return std::make_pair(image_error::BADSOFTWARE, "Problem reading the image at offset " + std::to_string(i));
return std::make_pair(image_error::UNSPECIFIED, "Problem reading the image at offset " + std::to_string(i));
prog_space.write_byte(i + 0x100, data);
}
// clear out command tail */
// clear out command tail
prog_space.write_byte(0x80, 0);
prog_space.write_byte(0x81, 0);