~thestr4ng3r/mymcplus

063abb83b89ac4b7092ff413f6822b09384f5edd — Florian Märkl 3 years ago b203a58
Rename package to mymcplus, Fix some packaging issues
20 files changed, 46 insertions(+), 46 deletions(-)

R mymc/__init__.py => mymcplus/__init__.py
R mymc/__main__.py => mymcplus/__main__.py
R mymc/gui/__init__.py => mymcplus/gui/__init__.py
R mymc/gui/dirlist_control.py => mymcplus/gui/dirlist_control.py
R mymc/gui/gui.py => mymcplus/gui/gui.py
R mymc/gui/icon_window.py => mymcplus/gui/icon_window.py
R mymc/gui/resources.py => mymcplus/gui/resources.py
R mymc/gui/utils.py => mymcplus/gui/utils.py
R mymc/lzari.py => mymcplus/lzari.py
R mymc/mymc.py => mymcplus/mymc.py
R mymc/ps2mc.py => mymcplus/ps2mc.py
R mymc/ps2mc_dir.py => mymcplus/ps2mc_dir.py
R mymc/ps2mc_ecc.py => mymcplus/ps2mc_ecc.py
R mymc/ps2save.py => mymcplus/ps2save.py
R mymc/round.py => mymcplus/round.py
R mymc/sjistab.py => mymcplus/sjistab.py
R mymc/verbuild.py => mymcplus/verbuild.py
M setup.py
M test/test_lzari.py
M test/test_memorycard.py
R mymc/__init__.py => mymcplus/__init__.py +0 -0
R mymc/__main__.py => mymcplus/__main__.py +0 -0
R mymc/gui/__init__.py => mymcplus/gui/__init__.py +0 -0
R mymc/gui/dirlist_control.py => mymcplus/gui/dirlist_control.py +0 -0
R mymc/gui/gui.py => mymcplus/gui/gui.py +5 -5
@@ 5,9 5,9 @@
# Public Domain
#

"""Graphical user-interface for mymc."""
"""Graphical user-interface for mymcplus."""

_SCCS_ID = "@(#) mymc gui.py 1.4 12/10/04 18:51:51\n"
_SCCS_ID = "@(#) mymcplus gui.py 1.4 12/10/04 18:51:51\n"

import os
import sys


@@ 34,7 34,7 @@ class GuiConfig(wx.Config):
    ascii = "ASCII Descriptions"
    
    def __init__(self):
        wx.Config.__init__(self, "mymc", "Ross Ridge",
        wx.Config.__init__(self, "mymcplus", "Ross Ridge",
                   style = wx.CONFIG_USE_LOCAL_FILE)

    def get_memcard_dir(self, default = None):


@@ 70,7 70,7 @@ class GuiFrame(wx.Frame):
    ID_CMD_DELETE = wx.ID_DELETE
    ID_CMD_ASCII = 106
    
    def message_box(self, message, caption = "mymc", style = wx.OK,
    def message_box(self, message, caption = "mymcplus", style = wx.OK,
            x = -1, y = -1):
        return wx.MessageBox(message, caption, style, self, x, y)



@@ 509,7 509,7 @@ def run(filename = None):
    """Display a GUI for working with memory card images."""

    wx_app = wx.App()
    frame = GuiFrame(None, "mymc", filename)
    frame = GuiFrame(None, "mymcplus", filename)
    return wx_app.MainLoop()
    
if __name__ == "__main__":

R mymc/gui/icon_window.py => mymcplus/gui/icon_window.py +0 -0
R mymc/gui/resources.py => mymcplus/gui/resources.py +0 -0
R mymc/gui/utils.py => mymcplus/gui/utils.py +0 -0
R mymc/lzari.py => mymcplus/lzari.py +0 -0
R mymc/mymc.py => mymcplus/mymc.py +4 -4
@@ 1,5 1,5 @@
#
# mymc.py
# mymcplus.py
#
# By Ross Ridge
# Public Domain


@@ 7,7 7,7 @@

"""A utility for manipulating PS2 memory card images."""

_SCCS_ID = "@(#) mysc mymc.py 1.12 12/10/04 19:09:16\n"[:-1]
_SCCS_ID = "@(#) mysc mymcplus.py 1.12 12/10/04 19:09:16\n"[:-1]

import sys
import os


@@ 706,7 706,7 @@ def main(argv=sys.argv):
    for cmd in sorted(cmd_table.keys()):
        description += "\n   " + cmd + ": " + cmd_table[cmd][3]
        
    version = ("mymc "
    version = ("mymcplus "
           + verbuild.MYMC_VERSION_MAJOR
           + "." + verbuild.MYMC_VERSION_BUILD
           + "   (" + _SCCS_ID + ")")


@@ 725,7 725,7 @@ def main(argv=sys.argv):

    if len(args) == 0:
        try:
            from gui import gui
            from .gui import gui
        except ImportError:
            gui = None
        if gui != None:

R mymc/ps2mc.py => mymcplus/ps2mc.py +0 -0
R mymc/ps2mc_dir.py => mymcplus/ps2mc_dir.py +0 -0
R mymc/ps2mc_ecc.py => mymcplus/ps2mc_ecc.py +0 -0
R mymc/ps2save.py => mymcplus/ps2save.py +0 -0
R mymc/round.py => mymcplus/round.py +0 -0
R mymc/sjistab.py => mymcplus/sjistab.py +0 -0
R mymc/verbuild.py => mymcplus/verbuild.py +0 -0
M setup.py => setup.py +3 -3
@@ 2,12 2,12 @@
from setuptools import setup

setup(
    name="mymc-plus",
    name="mymcplus",
    version="3.0",
    packages=["mymc"],
    packages=["mymcplus", "mymcplus.gui"],
    entry_points={
        "console_scripts": [
            "mymc-plus = mymc.mymc:main"
            "mymcplus = mymcplus.mymc:main"
        ]
    },
    install_requires=[

M test/test_lzari.py => test/test_lzari.py +1 -1
@@ 1,6 1,6 @@

import array
from mymc import lzari
from mymcplus import lzari


def bits_to_str(bits):

M test/test_memorycard.py => test/test_memorycard.py +33 -33
@@ 1,5 1,5 @@

from mymc import mymc
from mymcplus import mymc


def md5(fn):


@@ 22,7 22,7 @@ def patch_localtime(monkeypatch):

def test_ls(monkeypatch, capsys, data):
    patch_localtime(monkeypatch)
    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", data.join("mc01.ps2").strpath,
               "ls"])



@@ 37,7 37,7 @@ def test_ls(monkeypatch, capsys, data):
def test_extract(capsys, data, tmpdir):
    out_file = tmpdir.join("BESCES-50501REZ").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", data.join("mc01.ps2").strpath,
               "extract", "-o", out_file, "BESCES-50501REZ/BESCES-50501REZ"])



@@ 49,7 49,7 @@ def test_extract(capsys, data, tmpdir):


def test_add(monkeypatch, capsys, mc01_copy, tmpdir):
    from mymc import ps2mc
    from mymcplus import ps2mc
    patch_fixed_time(monkeypatch, ps2mc)
    patch_localtime(monkeypatch)



@@ 59,7 59,7 @@ def test_add(monkeypatch, capsys, mc01_copy, tmpdir):

    mc_file = mc01_copy.join("mc01.ps2").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "add", file])



@@ 67,7 67,7 @@ def test_add(monkeypatch, capsys, mc01_copy, tmpdir):
    assert output.out == ""
    assert output.err == ""

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "ls"])



@@ 83,7 83,7 @@ def test_add(monkeypatch, capsys, mc01_copy, tmpdir):


def test_check_ok(capsys, data):
    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", data.join("mc01.ps2").strpath,
               "check"])



@@ 100,7 100,7 @@ def test_check_root_directory(capsys, mc01_copy):

    assert md5(mc_file) == "bec7e8c3884806024b9eb9599dc4315f"

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "check"])



@@ 114,7 114,7 @@ def test_check_root_directory(capsys, mc01_copy):
def test_clear(capsys, mc01_copy):
    mc_file = mc01_copy.join("mc01.ps2").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "clear", "-x", "BESCES-50501REZ"])



@@ 128,7 128,7 @@ def test_clear(capsys, mc01_copy):
def test_set(capsys, mc01_copy):
    mc_file = mc01_copy.join("mc01.ps2").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "set", "-K", "BESCES-50501REZ"])



@@ 142,7 142,7 @@ def test_set(capsys, mc01_copy):
def test_delete(capsys, mc01_copy):
    mc_file = mc01_copy.join("mc01.ps2").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "delete", "BESCES-50501REZ"])



@@ 156,7 156,7 @@ def test_delete(capsys, mc01_copy):
def test_df(capsys, data):
    mc_file = data.join("mc01.ps2").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "df"])



@@ 168,7 168,7 @@ def test_df(capsys, data):
def test_dir(capsys, data):
    mc_file = data.join("mc01.ps2").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "dir", "-a"])



@@ 184,12 184,12 @@ def test_dir(capsys, data):


def test_format(monkeypatch, capsys, tmpdir):
    from mymc import ps2mc
    from mymcplus import ps2mc
    patch_fixed_time(monkeypatch, ps2mc)

    mc_file = tmpdir.join("mc.ps2").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "format"])



@@ 201,12 201,12 @@ def test_format(monkeypatch, capsys, tmpdir):


def test_mkdir(monkeypatch, capsys, mc01_copy):
    from mymc import ps2mc
    from mymcplus import ps2mc
    patch_fixed_time(monkeypatch, ps2mc)

    mc_file = mc01_copy.join("mc01.ps2").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "mkdir", "p0rn"])



@@ 220,7 220,7 @@ def test_mkdir(monkeypatch, capsys, mc01_copy):
def test_remove(capsys, mc01_copy):
    mc_file = mc01_copy.join("mc01.ps2").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "remove", "BESCES-50501REZ/BESCES-50501REZ"])



@@ 234,7 234,7 @@ def test_remove(capsys, mc01_copy):
def test_remove_nonempty(capsys, mc01_copy):
    mc_file = mc01_copy.join("mc01.ps2").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "remove", "BESCES-50501REZ"])



@@ 246,7 246,7 @@ def test_remove_nonempty(capsys, mc01_copy):
def test_export_psu(capsys, data, tmpdir):
    mc_file = data.join("mc01.ps2").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "export", "-d", tmpdir.strpath, "-p", "BESCES-50501REZ"])



@@ 260,7 260,7 @@ def test_export_psu(capsys, data, tmpdir):
def test_export_max(capsys, data, tmpdir):
    mc_file = data.join("mc01.ps2").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "export", "-d", tmpdir.strpath, "-m", "BESCES-50501REZ"])



@@ 271,13 271,13 @@ def test_export_max(capsys, data, tmpdir):


def test_import_psu(monkeypatch, capsys, data, mc02_copy):
    from mymc import ps2mc
    from mymcplus import ps2mc
    patch_fixed_time(monkeypatch, ps2mc)

    mc_file = mc02_copy.join("mc02.ps2").strpath
    psu_file = data.join("BESCES-50501REZ.psu").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "import", psu_file])



@@ 289,15 289,15 @@ def test_import_psu(monkeypatch, capsys, data, mc02_copy):


def test_import_max(monkeypatch, capsys, data, mc02_copy):
    from mymc import ps2mc
    from mymc import ps2save
    from mymcplus import ps2mc
    from mymcplus import ps2save
    patch_fixed_time(monkeypatch, ps2mc)
    patch_fixed_time(monkeypatch, ps2save)

    mc_file = mc02_copy.join("mc02.ps2").strpath
    max_file = data.join("BESCES-50501REZ.max").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "import", max_file])



@@ 308,13 308,13 @@ def test_import_max(monkeypatch, capsys, data, mc02_copy):


def test_import_sps(monkeypatch, capsys, data, mc02_copy):
    from mymc import ps2mc
    from mymcplus import ps2mc
    patch_fixed_time(monkeypatch, ps2mc)

    mc_file = mc02_copy.join("mc02.ps2").strpath
    sps_file = data.join("BESCES-50501REZ.sps").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "import", sps_file])



@@ 326,13 326,13 @@ def test_import_sps(monkeypatch, capsys, data, mc02_copy):


def test_import_xps(monkeypatch, capsys, data, mc02_copy):
    from mymc import ps2mc
    from mymcplus import ps2mc
    patch_fixed_time(monkeypatch, ps2mc)

    mc_file = mc02_copy.join("mc02.ps2").strpath
    xps_file = data.join("BESCES-50501REZ.xps").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "import", xps_file])



@@ 344,15 344,15 @@ def test_import_xps(monkeypatch, capsys, data, mc02_copy):


def test_import_cbs(monkeypatch, capsys, data, mc02_copy):
    from mymc import ps2mc
    from mymc import ps2save
    from mymcplus import ps2mc
    from mymcplus import ps2save
    patch_fixed_time(monkeypatch, ps2mc)
    patch_fixed_time(monkeypatch, ps2save)

    mc_file = mc02_copy.join("mc02.ps2").strpath
    cbs_file = data.join("BESCES-50501REZ.cbs").strpath

    mymc.main(["mymc",
    mymc.main(["mymcplus",
               "-i", mc_file,
               "import", cbs_file])