Skip to content

Commit

Permalink
Change name to avoid conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
MicroTransactionsMatterToo committed Jun 2, 2017
1 parent 075a333 commit 76c6873
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# midi documentation build configuration file, created by
# midisnake documentation build configuration file, created by
# sphinx-quickstart on Fri Jun 2 12:22:56 2017.
#
# This file is execfile()d with the current directory set to its
Expand Down Expand Up @@ -55,7 +55,7 @@
master_doc = 'index'

# General information about the project.
project = 'midi'
project = 'midisnake'
copyright = '2017, Ennis Massey'
author = 'Ennis Massey'

Expand Down Expand Up @@ -136,7 +136,7 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'midi.tex', 'midi Documentation',
(master_doc, 'midisnake.tex', 'midisnake Documentation',
'Ennis Massey', 'manual'),
]

Expand All @@ -146,7 +146,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'midi', 'midi Documentation',
(master_doc, 'midisnake', 'midisnake Documentation',
[author], 1)
]

Expand All @@ -157,8 +157,8 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, 'midi', 'midi Documentation',
author, 'midi', 'One line description of project.',
(master_doc, 'midisnake', 'midisnake Documentation',
author, 'midisnake', 'One line description of project.',
'Miscellaneous'),
]

Expand Down
2 changes: 1 addition & 1 deletion docs/parser.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. currentmodule:: midi.parser
.. currentmodule:: midisnake.parser

Parser
******
Expand Down
4 changes: 2 additions & 2 deletions docs/structure.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. currentmodule:: midi.structure
.. currentmodule:: midisnake.structure

Structure
*********
Expand All @@ -18,6 +18,6 @@ This documentation covers the internal representations of MIDI constructs, such
Despite not being part of the structure module, the `IntBuilder` is part of this


.. currentmodule:: midi.integers
.. currentmodule:: midisnake.integers

.. autoclass:: IntBuilder
Binary file removed midi/__pycache__/__init__.cpython-36.pyc
Binary file not shown.
Binary file removed midi/__pycache__/parser.cpython-36.pyc
Binary file not shown.
Binary file removed midi/__pycache__/structure.cpython-36.pyc
Binary file not shown.
4 changes: 2 additions & 2 deletions midi/__init__.py → midisnake/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

from midi.parser import *
from midi.structure import *
from midisnake.parser import *
from midisnake.structure import *

__all__ = ["Parser", "Event"]
2 changes: 1 addition & 1 deletion midi/integers.py → midisnake/integers.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def __init__(self, input_bytes: bytearray) -> None:
self.little_endian = int.from_bytes(input_bytes, "little")

def __repr__(self) -> str:
return "<midi.integers.IntBuilder at 0x{id_hex:x}, raw: 0x{raw_val}, little endian: {little_endian}, " \
return "<midisnake.integers.IntBuilder at 0x{id_hex:x}, raw: 0x{raw_val}, little endian: {little_endian}, " \
"big endian: " \
"{big_endian}, byte length: {byte_length}, C type: {c_type}>".format(
id_hex=id(self), raw_val=str(''.join([hex(x)[2:] for x in self.original_data])),
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
from setuptools import setup, find_packages

setup(
name="midi",
name="midisnake",
version="0.0.1",
author="Ennis Massey",
author_email="ennisbaradine@gmail.com",
description="Standard MIDI file parser for Python",

license="MIT",
keywords="midi file parser library",
keywords="midisnake file parser library",
packages=find_packages(),
install_requires=[
"typing"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_intbuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@
# SOFTWARE.
from unittest import TestCase

from midi.integers import IntBuilder, LengthException
from midisnake.integers import IntBuilder, LengthException


class TestIntBuilder(TestCase):
def test_repr(self):
self.intb_inst = IntBuilder(bytearray(b'\x01\xA4'))
memory_address = id(self.intb_inst)
self.assertEqual(repr(self.intb_inst), "<midi.integers.IntBuilder at 0x{mem_addr:x}, raw: 0x1a4, "
self.assertEqual(repr(self.intb_inst), "<midisnake.integers.IntBuilder at 0x{mem_addr:x}, raw: 0x1a4, "
"little endian: "
"41985, big endian: 420, byte length: 2, C type: uint16>".format(
mem_addr=memory_address))
self.intb_inst = IntBuilder(bytearray(b'\x2A'))
memory_address = id(self.intb_inst)
self.assertEqual(repr(self.intb_inst), "<midi.integers.IntBuilder at 0x{mem_addr:x}, raw: 0x2a, "
self.assertEqual(repr(self.intb_inst), "<midisnake.integers.IntBuilder at 0x{mem_addr:x}, raw: 0x2a, "
"little endian: "
"42, big endian: 42, byte length: 1, C type: uint8>".format(
mem_addr=memory_address))
Expand Down
2 changes: 1 addition & 1 deletion tests/test_track.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from unittest import TestCase

from midi.structure import Track
from midisnake.structure import Track


class TestTrack(TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_vlv.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from typing import Union
from io import BufferedReader

from midi.structure import VariableLengthValue
from midisnake.structure import VariableLengthValue


class TestVLV(TestCase):
Expand Down

0 comments on commit 76c6873

Please sign in to comment.