From ff309e468cc8e3279009d96acd04afa89abdd79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Wed, 26 Apr 2017 16:51:11 +0200 Subject: [PATCH] Rename "morituri" module to "whipper". Fixes https://github.com/JoeLametta/whipper/issues/100 --- HACKING | 2 +- doc/Makefile.am | 8 ++--- misc/header.py | 2 +- misc/pycheckerrc | 2 +- setup.py | 6 ++-- {morituri => whipper}/__init__.py | 0 {morituri => whipper}/command/__init__.py | 0 {morituri => whipper}/command/accurip.py | 4 +-- {morituri => whipper}/command/basecommand.py | 2 +- {morituri => whipper}/command/cd.py | 10 +++---- {morituri => whipper}/command/debug.py | 20 ++++++------- {morituri => whipper}/command/drive.py | 8 ++--- {morituri => whipper}/command/image.py | 12 ++++---- {morituri => whipper}/command/main.py | 16 +++++----- {morituri => whipper}/command/offset.py | 12 ++++---- {morituri => whipper}/common/__init__.py | 0 {morituri => whipper}/common/accurip.py | 4 +-- {morituri => whipper}/common/cache.py | 6 ++-- {morituri => whipper}/common/checksum.py | 6 ++-- {morituri => whipper}/common/common.py | 4 +-- {morituri => whipper}/common/config.py | 4 +-- {morituri => whipper}/common/directory.py | 2 +- {morituri => whipper}/common/drive.py | 2 +- {morituri => whipper}/common/encode.py | 8 ++--- {morituri => whipper}/common/mbngs.py | 2 +- {morituri => whipper}/common/path.py | 2 +- {morituri => whipper}/common/program.py | 16 +++++----- {morituri => whipper}/common/renamer.py | 2 +- {morituri => whipper}/common/task.py | 4 +-- {morituri => whipper}/extern/__init__.py | 0 {morituri => whipper}/extern/asyncsub.py | 0 {morituri => whipper}/extern/task/ChangeLog | 0 {morituri => whipper}/extern/task/__init__.py | 0 {morituri => whipper}/extern/task/task.py | 0 {morituri => whipper}/image/__init__.py | 0 {morituri => whipper}/image/cue.py | 6 ++-- {morituri => whipper}/image/image.py | 14 ++++----- {morituri => whipper}/image/table.py | 10 +++---- {morituri => whipper}/image/toc.py | 6 ++-- {morituri => whipper}/program/__init__.py | 0 {morituri => whipper}/program/arc.py | 0 {morituri => whipper}/program/cdparanoia.py | 14 ++++----- {morituri => whipper}/program/cdrdao.py | 4 +-- {morituri => whipper}/program/flac.py | 0 {morituri => whipper}/program/sox.py | 0 {morituri => whipper}/program/soxi.py | 4 +-- {morituri => whipper}/program/utils.py | 0 {morituri => whipper}/result/__init__.py | 0 {morituri => whipper}/result/logger.py | 8 ++--- {morituri => whipper}/result/result.py | 12 ++++---- {morituri => whipper}/test/__init__.py | 0 {morituri => whipper}/test/bloc.cue | 2 +- {morituri => whipper}/test/bloc.toc | 0 {morituri => whipper}/test/breeders.cue | 2 +- {morituri => whipper}/test/breeders.toc | 0 .../test/cache/result/fe105a11.pickle | Bin 4878 -> 4874 bytes {morituri => whipper}/test/capital.1.toc | 0 {morituri => whipper}/test/capital.2.toc | 0 {morituri => whipper}/test/capital.fast.toc | 0 .../test/cdparanoia.progress | 0 .../test/cdparanoia.progress.error | 0 .../test/cdparanoia.progress.strokes | 0 .../test/cdparanoia/MATSHITA.cdparanoia-A.log | 0 .../cdparanoia/MATSHITA.cdparanoia-A.stderr | 0 .../cdparanoia/PX-L890SA.cdparanoia-A.log | 0 .../cdparanoia/PX-L890SA.cdparanoia-A.stderr | 0 .../test/cdrdao.readtoc.progress | 0 {morituri => whipper}/test/common.py | 6 ++-- {morituri => whipper}/test/cure.cue | 2 +- {morituri => whipper}/test/cure.toc | 0 .../dBAR-011-0010e284-009228a3-9809ff0b.bin | Bin .../dBAR-020-002e5023-029d8e49-040eaa14.bin | Bin {morituri => whipper}/test/jose.toc | 0 {morituri => whipper}/test/kanye.cue | 0 {morituri => whipper}/test/kings-separate.cue | 0 {morituri => whipper}/test/kings-single.cue | 0 {morituri => whipper}/test/ladyhawke.toc | 0 ....3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json | 0 ....61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json | 0 ....a76714e0-32b1-4ed4-b28e-f86d99642193.json | 0 ....e32ae79a-336e-4d33-945c-8c5e8206dbd3.json | 0 ...e.08397059-86c1-463b-8ed0-cd596dbd174f.xml | 0 ...e.93a6268c-ddf1-4898-bf93-fb862b1c5c5e.xml | 0 ...e.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml | 0 .../test/silentalarm.result.pickle | 28 +++++++++--------- .../test/strokes-someday.eac.cue | 0 .../test/strokes-someday.toc | 0 .../test/surferrosa.eac.corrected.cue | 0 .../test/surferrosa.eac.currentgap.cue | 0 .../test/surferrosa.eac.leftout.cue | 0 .../test/surferrosa.eac.noncompliant.cue | 0 .../test/surferrosa.eac.single.cue | 0 {morituri => whipper}/test/surferrosa.toc | 0 .../test/test_common_accurip.py | 6 ++-- .../test/test_common_cache.py | 6 ++-- .../test/test_common_common.py | 6 ++-- .../test/test_common_config.py | 6 ++-- .../test/test_common_directory.py | 6 ++-- .../test/test_common_drive.py | 6 ++-- .../test/test_common_mbngs.py | 4 +-- .../test/test_common_path.py | 6 ++-- .../test/test_common_program.py | 8 ++--- .../test/test_common_renamer.py | 4 +-- {morituri => whipper}/test/test_image_cue.py | 12 ++++---- .../test/test_image_table.py | 6 ++-- {morituri => whipper}/test/test_image_toc.py | 6 ++-- .../test/test_program_cdparanoia.py | 8 ++--- .../test/test_program_cdrdao.py | 6 ++-- .../test/test_program_sox.py | 6 ++-- .../test/test_program_soxi.py | 10 +++---- {morituri => whipper}/test/totbl.fast.toc | 0 {morituri => whipper}/test/track-separate.cue | 0 {morituri => whipper}/test/track-single.cue | 0 {morituri => whipper}/test/track.flac | Bin 114 files changed, 198 insertions(+), 198 deletions(-) rename {morituri => whipper}/__init__.py (100%) rename {morituri => whipper}/command/__init__.py (100%) rename {morituri => whipper}/command/accurip.py (97%) rename {morituri => whipper}/command/basecommand.py (99%) rename {morituri => whipper}/command/cd.py (98%) rename {morituri => whipper}/command/debug.py (95%) rename {morituri => whipper}/command/drive.py (95%) rename {morituri => whipper}/command/image.py (95%) rename {morituri => whipper}/command/main.py (89%) rename {morituri => whipper}/command/offset.py (96%) rename {morituri => whipper}/common/__init__.py (100%) rename {morituri => whipper}/common/accurip.py (97%) rename {morituri => whipper}/common/cache.py (97%) rename {morituri => whipper}/common/checksum.py (92%) rename {morituri => whipper}/common/common.py (98%) rename {morituri => whipper}/common/config.py (97%) rename {morituri => whipper}/common/directory.py (95%) rename {morituri => whipper}/common/drive.py (96%) rename {morituri => whipper}/common/encode.py (93%) rename {morituri => whipper}/common/mbngs.py (99%) rename {morituri => whipper}/common/path.py (97%) rename {morituri => whipper}/common/program.py (98%) rename {morituri => whipper}/common/renamer.py (98%) rename {morituri => whipper}/common/task.py (97%) rename {morituri => whipper}/extern/__init__.py (100%) rename {morituri => whipper}/extern/asyncsub.py (100%) rename {morituri => whipper}/extern/task/ChangeLog (100%) rename {morituri => whipper}/extern/task/__init__.py (100%) rename {morituri => whipper}/extern/task/task.py (100%) rename {morituri => whipper}/image/__init__.py (100%) rename {morituri => whipper}/image/cue.py (97%) rename {morituri => whipper}/image/image.py (96%) rename {morituri => whipper}/image/table.py (99%) rename {morituri => whipper}/image/toc.py (99%) rename {morituri => whipper}/program/__init__.py (100%) rename {morituri => whipper}/program/arc.py (100%) rename {morituri => whipper}/program/cdparanoia.py (98%) rename {morituri => whipper}/program/cdrdao.py (96%) rename {morituri => whipper}/program/flac.py (100%) rename {morituri => whipper}/program/sox.py (100%) rename {morituri => whipper}/program/soxi.py (93%) rename {morituri => whipper}/program/utils.py (100%) rename {morituri => whipper}/result/__init__.py (100%) rename {morituri => whipper}/result/logger.py (98%) rename {morituri => whipper}/result/result.py (93%) rename {morituri => whipper}/test/__init__.py (100%) rename {morituri => whipper}/test/bloc.cue (96%) rename {morituri => whipper}/test/bloc.toc (100%) rename {morituri => whipper}/test/breeders.cue (97%) rename {morituri => whipper}/test/breeders.toc (100%) rename {morituri => whipper}/test/cache/result/fe105a11.pickle (95%) rename {morituri => whipper}/test/capital.1.toc (100%) rename {morituri => whipper}/test/capital.2.toc (100%) rename {morituri => whipper}/test/capital.fast.toc (100%) rename {morituri => whipper}/test/cdparanoia.progress (100%) rename {morituri => whipper}/test/cdparanoia.progress.error (100%) rename {morituri => whipper}/test/cdparanoia.progress.strokes (100%) rename {morituri => whipper}/test/cdparanoia/MATSHITA.cdparanoia-A.log (100%) rename {morituri => whipper}/test/cdparanoia/MATSHITA.cdparanoia-A.stderr (100%) rename {morituri => whipper}/test/cdparanoia/PX-L890SA.cdparanoia-A.log (100%) rename {morituri => whipper}/test/cdparanoia/PX-L890SA.cdparanoia-A.stderr (100%) rename {morituri => whipper}/test/cdrdao.readtoc.progress (100%) rename {morituri => whipper}/test/common.py (94%) rename {morituri => whipper}/test/cure.cue (97%) rename {morituri => whipper}/test/cure.toc (100%) rename {morituri => whipper}/test/dBAR-011-0010e284-009228a3-9809ff0b.bin (100%) rename {morituri => whipper}/test/dBAR-020-002e5023-029d8e49-040eaa14.bin (100%) rename {morituri => whipper}/test/jose.toc (100%) rename {morituri => whipper}/test/kanye.cue (100%) rename {morituri => whipper}/test/kings-separate.cue (100%) rename {morituri => whipper}/test/kings-single.cue (100%) rename {morituri => whipper}/test/ladyhawke.toc (100%) rename {morituri => whipper}/test/morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json (100%) rename {morituri => whipper}/test/morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json (100%) rename {morituri => whipper}/test/morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json (100%) rename {morituri => whipper}/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json (100%) rename {morituri => whipper}/test/release.08397059-86c1-463b-8ed0-cd596dbd174f.xml (100%) rename {morituri => whipper}/test/release.93a6268c-ddf1-4898-bf93-fb862b1c5c5e.xml (100%) rename {morituri => whipper}/test/release.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml (100%) rename {morituri => whipper}/test/silentalarm.result.pickle (90%) rename {morituri => whipper}/test/strokes-someday.eac.cue (100%) rename {morituri => whipper}/test/strokes-someday.toc (100%) rename {morituri => whipper}/test/surferrosa.eac.corrected.cue (100%) rename {morituri => whipper}/test/surferrosa.eac.currentgap.cue (100%) rename {morituri => whipper}/test/surferrosa.eac.leftout.cue (100%) rename {morituri => whipper}/test/surferrosa.eac.noncompliant.cue (100%) rename {morituri => whipper}/test/surferrosa.eac.single.cue (100%) rename {morituri => whipper}/test/surferrosa.toc (100%) rename {morituri => whipper}/test/test_common_accurip.py (84%) rename {morituri => whipper}/test/test_common_cache.py (76%) rename {morituri => whipper}/test/test_common_common.py (93%) rename {morituri => whipper}/test/test_common_config.py (93%) rename {morituri => whipper}/test/test_common_directory.py (65%) rename {morituri => whipper}/test/test_common_drive.py (68%) rename {morituri => whipper}/test/test_common_mbngs.py (97%) rename {morituri => whipper}/test/test_common_path.py (85%) rename {morituri => whipper}/test/test_common_program.py (94%) rename {morituri => whipper}/test/test_common_renamer.py (97%) rename {morituri => whipper}/test/test_image_cue.py (91%) rename {morituri => whipper}/test/test_image_table.py (95%) rename {morituri => whipper}/test/test_image_toc.py (99%) rename {morituri => whipper}/test/test_program_cdparanoia.py (92%) rename {morituri => whipper}/test/test_program_cdrdao.py (69%) rename {morituri => whipper}/test/test_program_sox.py (63%) rename {morituri => whipper}/test/test_program_soxi.py (88%) rename {morituri => whipper}/test/totbl.fast.toc (100%) rename {morituri => whipper}/test/track-separate.cue (100%) rename {morituri => whipper}/test/track-single.cue (100%) rename {morituri => whipper}/test/track.flac (100%) diff --git a/HACKING b/HACKING index 8a9c5a3..420eeb4 100644 --- a/HACKING +++ b/HACKING @@ -44,7 +44,7 @@ unicode - Use asserts liberally to ensure this so we catch problems earlier. - All gst.parse_launch() pipelines should be passed as utf-8; use encode('utf-8') -- morituri.extern.log.log is not unicode-safe; don't pass it unicode objects; +- whipper.extern.log.log is not unicode-safe; don't pass it unicode objects; for example, always use %r to log paths - run with RIP_DEBUG=5 once in a while to catch unicode/logging errors. - Also use unicode prefix/suffix in tempfile.* methods; to force unicode. diff --git a/doc/Makefile.am b/doc/Makefile.am index c115c2c..77a518a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,8 +4,8 @@ DISTCLEANFILES = $(man_MANS) all-local: feeds reference if HAVE_EPYDOC -reference: $(top_srcdir)/morituri/*.py feeds - epydoc -o reference $(top_srcdir)/morituri +reference: $(top_srcdir)/whipper/*.py feeds + epydoc -o reference $(top_srcdir)/whipper else reference: @true @@ -23,8 +23,8 @@ morituri.ics: $(top_srcdir)/morituri.doap man_MANS = rip.1 -rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri - PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1 +rip.1: $(top_srcdir)/whipper/extern/python-command/scripts/help2man $(top_srcdir)/whipper + PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/whipper/extern/python-command/scripts/help2man whipper.rip.main.Rip rip > rip.1 clean-local: @rm -rf reference diff --git a/misc/header.py b/misc/header.py index 2bee413..46d9c74 100644 --- a/misc/header.py +++ b/misc/header.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_header -*- +# -*- Mode: Python; test-case-name: whipper.test.test_header -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP diff --git a/misc/pycheckerrc b/misc/pycheckerrc index 8f63c7b..697f40f 100644 --- a/misc/pycheckerrc +++ b/misc/pycheckerrc @@ -182,7 +182,7 @@ blacklist = [ #warning: couldn't find real module for class xml.parsers.expat.ExpatError (module name: xml.parsers.expat) 'xml.parsers.expat', 'unittest', - 'morituri.extern.log.log', + 'whipper.extern.log.log', ] # ignore global variables not used if name is one of these values diff --git a/setup.py b/setup.py index 9985675..9262a8d 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,9 @@ from setuptools import setup, find_packages -from morituri import __version__ as morituri_version +from whipper import __version__ as whipper_version setup( name="whipper", - version=morituri_version, + version=whipper_version, description="a secure cd ripper preferring accuracy over speed", author=['Thomas Vander Stichele', 'Joe Lametta', 'Samantha Baldwin'], maintainer=['Joe Lametta', 'Samantha Baldwin'], @@ -12,7 +12,7 @@ setup( packages=find_packages(), entry_points={ 'console_scripts': [ - 'whipper = morituri.command.main:main' + 'whipper = whipper.command.main:main' ] } ) diff --git a/morituri/__init__.py b/whipper/__init__.py similarity index 100% rename from morituri/__init__.py rename to whipper/__init__.py diff --git a/morituri/command/__init__.py b/whipper/command/__init__.py similarity index 100% rename from morituri/command/__init__.py rename to whipper/command/__init__.py diff --git a/morituri/command/accurip.py b/whipper/command/accurip.py similarity index 97% rename from morituri/command/accurip.py rename to whipper/command/accurip.py index e1b1868..c55db1d 100644 --- a/morituri/command/accurip.py +++ b/whipper/command/accurip.py @@ -22,8 +22,8 @@ import sys -from morituri.command.basecommand import BaseCommand -from morituri.common import accurip +from whipper.command.basecommand import BaseCommand +from whipper.common import accurip import logging logger = logging.getLogger(__name__) diff --git a/morituri/command/basecommand.py b/whipper/command/basecommand.py similarity index 99% rename from morituri/command/basecommand.py rename to whipper/command/basecommand.py index 563dde0..8e96a21 100644 --- a/morituri/command/basecommand.py +++ b/whipper/command/basecommand.py @@ -5,7 +5,7 @@ import argparse import os import sys -from morituri.common import drive +from whipper.common import drive import logging logger = logging.getLogger(__name__) diff --git a/morituri/command/cd.py b/whipper/command/cd.py similarity index 98% rename from morituri/command/cd.py rename to whipper/command/cd.py index 58a4f79..937d846 100644 --- a/morituri/command/cd.py +++ b/whipper/command/cd.py @@ -30,12 +30,12 @@ import sys import gobject gobject.threads_init() -from morituri.command.basecommand import BaseCommand -from morituri.common import ( +from whipper.command.basecommand import BaseCommand +from whipper.common import ( accurip, common, config, drive, program, task ) -from morituri.program import cdrdao, cdparanoia, utils -from morituri.result import result +from whipper.program import cdrdao, cdparanoia, utils +from whipper.result import result import logging logger = logging.getLogger(__name__) @@ -225,7 +225,7 @@ class Info(_CD): class Rip(_CD): summary = "rip CD" - # see morituri.common.program.Program.getPath for expansion + # see whipper.common.program.Program.getPath for expansion description = """ Rips a CD. diff --git a/morituri/command/debug.py b/whipper/command/debug.py similarity index 95% rename from morituri/command/debug.py rename to whipper/command/debug.py index 5d2b57f..e02e31c 100644 --- a/morituri/command/debug.py +++ b/whipper/command/debug.py @@ -23,9 +23,9 @@ import argparse import sys -from morituri.command.basecommand import BaseCommand -from morituri.common import cache, task -from morituri.result import result +from whipper.command.basecommand import BaseCommand +from whipper.common import cache, task +from whipper.result import result import logging logger = logging.getLogger(__name__) @@ -136,7 +136,7 @@ class Checksum(BaseCommand): def do(self): runner = task.SyncRunner() # here to avoid import gst eating our options - from morituri.common import checksum + from whipper.common import checksum for f in self.options.files: fromPath = unicode(f) @@ -151,7 +151,7 @@ class Encode(BaseCommand): def add_arguments(self): # here to avoid import gst eating our options - from morituri.common import encode + from whipper.common import encode self.parser.add_argument('input', action='store', help="audio file to encode") @@ -159,7 +159,7 @@ class Encode(BaseCommand): help="output path") def do(self): - from morituri.common import encode + from whipper.common import encode try: fromPath = unicode(self.options.input) @@ -209,7 +209,7 @@ class Tag(BaseCommand): runner = task.SyncRunner() - from morituri.common import encode + from whipper.common import encode logger.debug('Reading tags from %s' % path.encode('utf-8')) tagtask = encode.TagReadTask(path) @@ -238,7 +238,7 @@ Example disc id: KnpGsLhvH.lPrNc1PBL21lb9Bg4-""" sys.stdout.write('Please specify a MusicBrainz disc id.\n') return 3 - from morituri.common import mbngs + from whipper.common import mbngs metadatas = mbngs.musicbrainz(discId, record=self.options.record) sys.stdout.write('%d releases\n' % len(metadatas)) @@ -265,7 +265,7 @@ class CDParanoia(BaseCommand): description = summary def do(self): - from morituri.program import cdparanoia + from whipper.program import cdparanoia version = cdparanoia.getCdParanoiaVersion() sys.stdout.write("cdparanoia version: %s\n" % version) @@ -275,7 +275,7 @@ class CDRDAO(BaseCommand): description = summary def do(self): - from morituri.program import cdrdao + from whipper.program import cdrdao version = cdrdao.getCDRDAOVersion() sys.stdout.write("cdrdao version: %s\n" % version) diff --git a/morituri/command/drive.py b/whipper/command/drive.py similarity index 95% rename from morituri/command/drive.py rename to whipper/command/drive.py index af1a2ad..3a69e8c 100644 --- a/morituri/command/drive.py +++ b/whipper/command/drive.py @@ -22,10 +22,10 @@ import sys -from morituri.command.basecommand import BaseCommand -from morituri.common import config, drive -from morituri.extern.task import task -from morituri.program import cdparanoia +from whipper.command.basecommand import BaseCommand +from whipper.common import config, drive +from whipper.extern.task import task +from whipper.program import cdparanoia import logging logger = logging.getLogger(__name__) diff --git a/morituri/command/image.py b/whipper/command/image.py similarity index 95% rename from morituri/command/image.py rename to whipper/command/image.py index fde28f3..313163d 100644 --- a/morituri/command/image.py +++ b/whipper/command/image.py @@ -23,12 +23,12 @@ import os import sys -from morituri.command.basecommand import BaseCommand -from morituri.common import accurip, config, program -from morituri.common import encode -from morituri.extern.task import task -from morituri.image import image -from morituri.result import result +from whipper.command.basecommand import BaseCommand +from whipper.common import accurip, config, program +from whipper.common import encode +from whipper.extern.task import task +from whipper.image import image +from whipper.result import result import logging logger = logging.getLogger(__name__) diff --git a/morituri/command/main.py b/whipper/command/main.py similarity index 89% rename from morituri/command/main.py rename to whipper/command/main.py index 03ea106..0219591 100644 --- a/morituri/command/main.py +++ b/whipper/command/main.py @@ -6,20 +6,20 @@ import sys import pkg_resources import musicbrainzngs -import morituri +import whipper -from morituri.command import cd, offset, drive, image, accurip, debug -from morituri.command.basecommand import BaseCommand -from morituri.common import common, directory -from morituri.extern.task import task -from morituri.program.utils import eject_device +from whipper.command import cd, offset, drive, image, accurip, debug +from whipper.command.basecommand import BaseCommand +from whipper.common import common, directory +from whipper.extern.task import task +from whipper.program.utils import eject_device import logging logger = logging.getLogger(__name__) def main(): # set user agent - musicbrainzngs.set_useragent("whipper", morituri.__version__, + musicbrainzngs.set_useragent("whipper", whipper.__version__, "https://github.com/JoeLametta/whipper") # register plugins with pkg_resources distributions, _ = pkg_resources.working_set.find_plugins( @@ -92,5 +92,5 @@ You can get help on subcommands by using the -h option to the subcommand. self.parser.print_help() sys.exit(0) if self.options.version: - print "whipper %s" % morituri.__version__ + print "whipper %s" % whipper.__version__ sys.exit(0) diff --git a/morituri/command/offset.py b/whipper/command/offset.py similarity index 96% rename from morituri/command/offset.py rename to whipper/command/offset.py index 6fe9d75..4a8734f 100644 --- a/morituri/command/offset.py +++ b/whipper/command/offset.py @@ -28,13 +28,13 @@ import tempfile import gobject gobject.threads_init() -from morituri.command.basecommand import BaseCommand -from morituri.common import accurip, common, config, drive, program -from morituri.common import task as ctask -from morituri.program import cdrdao, cdparanoia, utils -from morituri.common import checksum +from whipper.command.basecommand import BaseCommand +from whipper.common import accurip, common, config, drive, program +from whipper.common import task as ctask +from whipper.program import cdrdao, cdparanoia, utils +from whipper.common import checksum -from morituri.extern.task import task +from whipper.extern.task import task import logging logger = logging.getLogger(__name__) diff --git a/morituri/common/__init__.py b/whipper/common/__init__.py similarity index 100% rename from morituri/common/__init__.py rename to whipper/common/__init__.py diff --git a/morituri/common/accurip.py b/whipper/common/accurip.py similarity index 97% rename from morituri/common/accurip.py rename to whipper/common/accurip.py index 1c5e5d8..e8df484 100644 --- a/morituri/common/accurip.py +++ b/whipper/common/accurip.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_accurip -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_accurip -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -26,7 +26,7 @@ import struct import urlparse import urllib2 -from morituri.common import directory +from whipper.common import directory import logging logger = logging.getLogger(__name__) diff --git a/morituri/common/cache.py b/whipper/common/cache.py similarity index 97% rename from morituri/common/cache.py rename to whipper/common/cache.py index d87de98..874fc3f 100644 --- a/morituri/common/cache.py +++ b/whipper/common/cache.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_cache -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_cache -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -26,8 +26,8 @@ import glob import tempfile import shutil -from morituri.result import result -from morituri.common import directory +from whipper.result import result +from whipper.common import directory import logging logger = logging.getLogger(__name__) diff --git a/morituri/common/checksum.py b/whipper/common/checksum.py similarity index 92% rename from morituri/common/checksum.py rename to whipper/common/checksum.py index 9a5de58..3d6daea 100644 --- a/morituri/common/checksum.py +++ b/whipper/common/checksum.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_checksum -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_checksum -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -24,9 +24,9 @@ import binascii import wave -from morituri.extern.task import task as etask +from whipper.extern.task import task as etask -from morituri.program.arc import accuraterip_checksum +from whipper.program.arc import accuraterip_checksum import logging logger = logging.getLogger(__name__) diff --git a/morituri/common/common.py b/whipper/common/common.py similarity index 98% rename from morituri/common/common.py rename to whipper/common/common.py index 068dd25..1dd47d6 100644 --- a/morituri/common/common.py +++ b/whipper/common/common.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_common -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_common -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -27,7 +27,7 @@ import commands import math import subprocess -from morituri.extern import asyncsub +from whipper.extern import asyncsub import logging logger = logging.getLogger(__name__) diff --git a/morituri/common/config.py b/whipper/common/config.py similarity index 97% rename from morituri/common/config.py rename to whipper/common/config.py index 136e5e4..f89c3b5 100644 --- a/morituri/common/config.py +++ b/whipper/common/config.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_config -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_config -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -27,7 +27,7 @@ import shutil import tempfile import urllib -from morituri.common import directory +from whipper.common import directory import logging logger = logging.getLogger(__name__) diff --git a/morituri/common/directory.py b/whipper/common/directory.py similarity index 95% rename from morituri/common/directory.py rename to whipper/common/directory.py index 53e0e57..e38cf60 100644 --- a/morituri/common/directory.py +++ b/whipper/common/directory.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_directory -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_directory -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP diff --git a/morituri/common/drive.py b/whipper/common/drive.py similarity index 96% rename from morituri/common/drive.py rename to whipper/common/drive.py index 62b89e2..be8fc36 100644 --- a/morituri/common/drive.py +++ b/whipper/common/drive.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_drive -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_drive -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP diff --git a/morituri/common/encode.py b/whipper/common/encode.py similarity index 93% rename from morituri/common/encode.py rename to whipper/common/encode.py index 28f489a..062ee39 100644 --- a/morituri/common/encode.py +++ b/whipper/common/encode.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_encode -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_encode -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -23,10 +23,10 @@ from mutagen.flac import FLAC -from morituri.extern.task import task +from whipper.extern.task import task -from morituri.program import sox -from morituri.program import flac +from whipper.program import sox +from whipper.program import flac import logging logger = logging.getLogger(__name__) diff --git a/morituri/common/mbngs.py b/whipper/common/mbngs.py similarity index 99% rename from morituri/common/mbngs.py rename to whipper/common/mbngs.py index 1b7751e..b634146 100644 --- a/morituri/common/mbngs.py +++ b/whipper/common/mbngs.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_mbngs -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_mbngs -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP diff --git a/morituri/common/path.py b/whipper/common/path.py similarity index 97% rename from morituri/common/path.py rename to whipper/common/path.py index 56f775b..1c5718a 100644 --- a/morituri/common/path.py +++ b/whipper/common/path.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_path -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_path -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP diff --git a/morituri/common/program.py b/whipper/common/program.py similarity index 98% rename from morituri/common/program.py rename to whipper/common/program.py index e69706e..e8a4721 100644 --- a/morituri/common/program.py +++ b/whipper/common/program.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_program -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_program -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -29,11 +29,11 @@ import os import sys import time -from morituri.common import common, mbngs, cache, path -from morituri.common import checksum -from morituri.program import cdrdao, cdparanoia -from morituri.image import image -from morituri.extern.task import task +from whipper.common import common, mbngs, cache, path +from whipper.common import checksum +from whipper.program import cdrdao, cdparanoia +from whipper.image import image +from whipper.extern.task import task import logging logger = logging.getLogger(__name__) @@ -51,7 +51,7 @@ class Program: @ivar result: the rip's result @type result: L{result.RipResult} @type outdir: unicode - @type config: L{morituri.common.config.Config} + @type config: L{whipper.common.config.Config} """ cuePath = None @@ -286,7 +286,7 @@ class Program: def getMusicBrainz(self, ittoc, mbdiscid, release=None, country=None, prompt=False): """ - @type ittoc: L{morituri.image.table.Table} + @type ittoc: L{whipper.image.table.Table} """ # look up disc on musicbrainz self._stdout.write('Disc duration: %s, %d audio tracks\n' % ( diff --git a/morituri/common/renamer.py b/whipper/common/renamer.py similarity index 98% rename from morituri/common/renamer.py rename to whipper/common/renamer.py index 18ab98b..177d6e7 100644 --- a/morituri/common/renamer.py +++ b/whipper/common/renamer.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_renamer -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_renamer -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP diff --git a/morituri/common/task.py b/whipper/common/task.py similarity index 97% rename from morituri/common/task.py rename to whipper/common/task.py index 2419704..e1f4bcf 100644 --- a/morituri/common/task.py +++ b/whipper/common/task.py @@ -5,8 +5,8 @@ import os import signal import subprocess -from morituri.extern import asyncsub -from morituri.extern.task import task +from whipper.extern import asyncsub +from whipper.extern.task import task import logging logger = logging.getLogger(__name__) diff --git a/morituri/extern/__init__.py b/whipper/extern/__init__.py similarity index 100% rename from morituri/extern/__init__.py rename to whipper/extern/__init__.py diff --git a/morituri/extern/asyncsub.py b/whipper/extern/asyncsub.py similarity index 100% rename from morituri/extern/asyncsub.py rename to whipper/extern/asyncsub.py diff --git a/morituri/extern/task/ChangeLog b/whipper/extern/task/ChangeLog similarity index 100% rename from morituri/extern/task/ChangeLog rename to whipper/extern/task/ChangeLog diff --git a/morituri/extern/task/__init__.py b/whipper/extern/task/__init__.py similarity index 100% rename from morituri/extern/task/__init__.py rename to whipper/extern/task/__init__.py diff --git a/morituri/extern/task/task.py b/whipper/extern/task/task.py similarity index 100% rename from morituri/extern/task/task.py rename to whipper/extern/task/task.py diff --git a/morituri/image/__init__.py b/whipper/image/__init__.py similarity index 100% rename from morituri/image/__init__.py rename to whipper/image/__init__.py diff --git a/morituri/image/cue.py b/whipper/image/cue.py similarity index 97% rename from morituri/image/cue.py rename to whipper/image/cue.py index 934f0c5..9ab0729 100644 --- a/morituri/image/cue.py +++ b/whipper/image/cue.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_image_cue -*- +# -*- Mode: Python; test-case-name: whipper.test.test_image_cue -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -29,8 +29,8 @@ See http://digitalx.org/cuesheetsyntax.php import re import codecs -from morituri.common import common -from morituri.image import table +from whipper.common import common +from whipper.image import table import logging logger = logging.getLogger(__name__) diff --git a/morituri/image/image.py b/whipper/image/image.py similarity index 96% rename from morituri/image/image.py rename to whipper/image/image.py index 31f6beb..6d4e7af 100644 --- a/morituri/image/image.py +++ b/whipper/image/image.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_image_image -*- +# -*- Mode: Python; test-case-name: whipper.test.test_image_image -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -26,12 +26,12 @@ Wrap on-disk CD images based on the .cue file. import os -from morituri.common import encode -from morituri.common import common -from morituri.common import checksum -from morituri.image import cue, table -from morituri.extern.task import task -from morituri.program.soxi import AudioLengthTask +from whipper.common import encode +from whipper.common import common +from whipper.common import checksum +from whipper.image import cue, table +from whipper.extern.task import task +from whipper.program.soxi import AudioLengthTask import logging logger = logging.getLogger(__name__) diff --git a/morituri/image/table.py b/whipper/image/table.py similarity index 99% rename from morituri/image/table.py rename to whipper/image/table.py index 28e2aff..c4bffb9 100644 --- a/morituri/image/table.py +++ b/whipper/image/table.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_image_table -*- +# -*- Mode: Python; test-case-name: whipper.test.test_image_table -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -28,9 +28,9 @@ import copy import urllib import urlparse -import morituri +import whipper -from morituri.common import common +from whipper.common import common import logging logger = logging.getLogger(__name__) @@ -527,7 +527,7 @@ class Table(object): discId1[-1], discId1[-2], discId1[-3], self.getAudioTracks(), discId1, discId2, self.getCDDBDiscId()) - def cue(self, cuePath='', program='morituri'): + def cue(self, cuePath='', program='whipper'): """ @param cuePath: path to the cue file to be written. If empty, will treat paths as if in current directory. @@ -556,7 +556,7 @@ class Table(object): assert self.hasTOC(), "Table does not represent a full CD TOC" lines.append('REM DISCID %s' % self.getCDDBDiscId().upper()) - lines.append('REM COMMENT "%s %s"' % (program, morituri.__version__)) + lines.append('REM COMMENT "%s %s"' % (program, whipper.__version__)) if self.catalog: lines.append("CATALOG %s" % self.catalog) diff --git a/morituri/image/toc.py b/whipper/image/toc.py similarity index 99% rename from morituri/image/toc.py rename to whipper/image/toc.py index 2bf7304..2dde18d 100644 --- a/morituri/image/toc.py +++ b/whipper/image/toc.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_image_toc -*- +# -*- Mode: Python; test-case-name: whipper.test.test_image_toc -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -29,8 +29,8 @@ The .toc file format is described in the man page of cdrdao import re import codecs -from morituri.common import common -from morituri.image import table +from whipper.common import common +from whipper.image import table import logging logger = logging.getLogger(__name__) diff --git a/morituri/program/__init__.py b/whipper/program/__init__.py similarity index 100% rename from morituri/program/__init__.py rename to whipper/program/__init__.py diff --git a/morituri/program/arc.py b/whipper/program/arc.py similarity index 100% rename from morituri/program/arc.py rename to whipper/program/arc.py diff --git a/morituri/program/cdparanoia.py b/whipper/program/cdparanoia.py similarity index 98% rename from morituri/program/cdparanoia.py rename to whipper/program/cdparanoia.py index b674461..205e35e 100644 --- a/morituri/program/cdparanoia.py +++ b/whipper/program/cdparanoia.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_program_cdparanoia -*- +# -*- Mode: Python; test-case-name: whipper.test.test_program_cdparanoia -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -29,10 +29,10 @@ import subprocess import tempfile import time -from morituri.common import common -from morituri.common import task as ctask -from morituri.extern import asyncsub -from morituri.extern.task import task +from whipper.common import common +from whipper.common import task as ctask +from whipper.extern import asyncsub +from whipper.extern.task import task import logging logger = logging.getLogger(__name__) @@ -459,7 +459,7 @@ class ReadVerifyTrackTask(task.MultiSeparateTask): os.close(fd) self._tmpwavpath = tmppath - from morituri.common import checksum + from whipper.common import checksum self.tasks = [] self.tasks.append( @@ -484,7 +484,7 @@ class ReadVerifyTrackTask(task.MultiSeparateTask): self._tmppath = tmpoutpath self.path = path - from morituri.common import encode + from whipper.common import encode self.tasks.append(encode.FlacEncodeTask(tmppath, tmpoutpath)) diff --git a/morituri/program/cdrdao.py b/whipper/program/cdrdao.py similarity index 96% rename from morituri/program/cdrdao.py rename to whipper/program/cdrdao.py index 682d1a6..037588f 100644 --- a/morituri/program/cdrdao.py +++ b/whipper/program/cdrdao.py @@ -3,8 +3,8 @@ import re import tempfile from subprocess import Popen, PIPE -from morituri.common.common import EjectError -from morituri.image.toc import TocFile +from whipper.common.common import EjectError +from whipper.image.toc import TocFile import logging logger = logging.getLogger(__name__) diff --git a/morituri/program/flac.py b/whipper/program/flac.py similarity index 100% rename from morituri/program/flac.py rename to whipper/program/flac.py diff --git a/morituri/program/sox.py b/whipper/program/sox.py similarity index 100% rename from morituri/program/sox.py rename to whipper/program/sox.py diff --git a/morituri/program/soxi.py b/whipper/program/soxi.py similarity index 93% rename from morituri/program/soxi.py rename to whipper/program/soxi.py index 36fb03a..650e144 100644 --- a/morituri/program/soxi.py +++ b/whipper/program/soxi.py @@ -1,7 +1,7 @@ import os -from morituri.common import common -from morituri.common import task as ctask +from whipper.common import common +from whipper.common import task as ctask import logging logger = logging.getLogger(__name__) diff --git a/morituri/program/utils.py b/whipper/program/utils.py similarity index 100% rename from morituri/program/utils.py rename to whipper/program/utils.py diff --git a/morituri/result/__init__.py b/whipper/result/__init__.py similarity index 100% rename from morituri/result/__init__.py rename to whipper/result/__init__.py diff --git a/morituri/result/logger.py b/whipper/result/logger.py similarity index 98% rename from morituri/result/logger.py rename to whipper/result/logger.py index fbd3505..3379264 100644 --- a/morituri/result/logger.py +++ b/whipper/result/logger.py @@ -1,10 +1,10 @@ import time import hashlib -import morituri +import whipper -from morituri.common import common -from morituri.result import result +from whipper.common import common +from whipper.result import result class MorituriLogger(result.Logger): @@ -26,7 +26,7 @@ class MorituriLogger(result.Logger): # Ripper version lines.append("Log created by: whipper %s (internal logger)" % - morituri.__version__) + whipper.__version__) # Rip date date = time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime(epoch)).strip() diff --git a/morituri/result/result.py b/whipper/result/result.py similarity index 93% rename from morituri/result/result.py rename to whipper/result/result.py index 1487677..5b9a395 100644 --- a/morituri/result/result.py +++ b/whipper/result/result.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_result_result -*- +# -*- Mode: Python; test-case-name: whipper.test.test_result_result -*- # vi:si:et:sw=4:sts=4:ts=4 # Morituri - for those about to RIP @@ -83,7 +83,7 @@ class RipResult: @ivar offset: sample read offset @ivar table: the full index table - @type table: L{morituri.image.table.Table} + @type table: L{whipper.image.table.Table} @ivar vendor: vendor of the CD drive @ivar model: model of the CD drive @@ -149,22 +149,22 @@ class Logger(object): class EntryPoint(object): - name = 'morituri' + name = 'whipper' def load(self): - from morituri.result import logger + from whipper.result import logger return logger.MorituriLogger def getLoggers(): """ - Get all logger plugins with entry point 'morituri.logger'. + Get all logger plugins with entry point 'whipper.logger'. @rtype: dict of C{str} -> C{Logger} """ d = {} - pluggables = list(pkg_resources.iter_entry_points("morituri.logger")) + pluggables = list(pkg_resources.iter_entry_points("whipper.logger")) for entrypoint in [EntryPoint(), ] + pluggables: plugin_class = entrypoint.load() d[entrypoint.name] = plugin_class diff --git a/morituri/test/__init__.py b/whipper/test/__init__.py similarity index 100% rename from morituri/test/__init__.py rename to whipper/test/__init__.py diff --git a/morituri/test/bloc.cue b/whipper/test/bloc.cue similarity index 96% rename from morituri/test/bloc.cue rename to whipper/test/bloc.cue index c1be8a6..16d08ed 100644 --- a/morituri/test/bloc.cue +++ b/whipper/test/bloc.cue @@ -1,5 +1,5 @@ REM DISCID AD0BE00D -REM COMMENT "morituri 0.5.1" +REM COMMENT "whipper 0.5.1" FILE "data.wav" WAVE TRACK 01 AUDIO PREGAP 03:22:70 diff --git a/morituri/test/bloc.toc b/whipper/test/bloc.toc similarity index 100% rename from morituri/test/bloc.toc rename to whipper/test/bloc.toc diff --git a/morituri/test/breeders.cue b/whipper/test/breeders.cue similarity index 97% rename from morituri/test/breeders.cue rename to whipper/test/breeders.cue index 4b3e358..e55a56d 100644 --- a/morituri/test/breeders.cue +++ b/whipper/test/breeders.cue @@ -1,5 +1,5 @@ REM DISCID BE08990D -REM COMMENT "morituri 0.5.1" +REM COMMENT "whipper 0.5.1" CATALOG 0652637280326 PERFORMER "THE BREEDERS" TITLE "MOUNTAIN BATTLES" diff --git a/morituri/test/breeders.toc b/whipper/test/breeders.toc similarity index 100% rename from morituri/test/breeders.toc rename to whipper/test/breeders.toc diff --git a/morituri/test/cache/result/fe105a11.pickle b/whipper/test/cache/result/fe105a11.pickle similarity index 95% rename from morituri/test/cache/result/fe105a11.pickle rename to whipper/test/cache/result/fe105a11.pickle index 97c91cc0ea689f3d8d07a384b1ad324a8a2446e1..9ae322d9319d3d3956a8869b2b6baabd089153ab 100644 GIT binary patch delta 70 zcmeBE>r&%xVA4n~&&Vt&NG+Pk)6EWLZk*r24P#H%=W&6vt9epj?9I=4)Y%xh0ELwq A4FCWD delta 73 zcmeBD>r>-tVA4p=%`eI!42n3*5PqMaLRd7;GE5mc+}Yd=tUc3 diff --git a/morituri/test/capital.1.toc b/whipper/test/capital.1.toc similarity index 100% rename from morituri/test/capital.1.toc rename to whipper/test/capital.1.toc diff --git a/morituri/test/capital.2.toc b/whipper/test/capital.2.toc similarity index 100% rename from morituri/test/capital.2.toc rename to whipper/test/capital.2.toc diff --git a/morituri/test/capital.fast.toc b/whipper/test/capital.fast.toc similarity index 100% rename from morituri/test/capital.fast.toc rename to whipper/test/capital.fast.toc diff --git a/morituri/test/cdparanoia.progress b/whipper/test/cdparanoia.progress similarity index 100% rename from morituri/test/cdparanoia.progress rename to whipper/test/cdparanoia.progress diff --git a/morituri/test/cdparanoia.progress.error b/whipper/test/cdparanoia.progress.error similarity index 100% rename from morituri/test/cdparanoia.progress.error rename to whipper/test/cdparanoia.progress.error diff --git a/morituri/test/cdparanoia.progress.strokes b/whipper/test/cdparanoia.progress.strokes similarity index 100% rename from morituri/test/cdparanoia.progress.strokes rename to whipper/test/cdparanoia.progress.strokes diff --git a/morituri/test/cdparanoia/MATSHITA.cdparanoia-A.log b/whipper/test/cdparanoia/MATSHITA.cdparanoia-A.log similarity index 100% rename from morituri/test/cdparanoia/MATSHITA.cdparanoia-A.log rename to whipper/test/cdparanoia/MATSHITA.cdparanoia-A.log diff --git a/morituri/test/cdparanoia/MATSHITA.cdparanoia-A.stderr b/whipper/test/cdparanoia/MATSHITA.cdparanoia-A.stderr similarity index 100% rename from morituri/test/cdparanoia/MATSHITA.cdparanoia-A.stderr rename to whipper/test/cdparanoia/MATSHITA.cdparanoia-A.stderr diff --git a/morituri/test/cdparanoia/PX-L890SA.cdparanoia-A.log b/whipper/test/cdparanoia/PX-L890SA.cdparanoia-A.log similarity index 100% rename from morituri/test/cdparanoia/PX-L890SA.cdparanoia-A.log rename to whipper/test/cdparanoia/PX-L890SA.cdparanoia-A.log diff --git a/morituri/test/cdparanoia/PX-L890SA.cdparanoia-A.stderr b/whipper/test/cdparanoia/PX-L890SA.cdparanoia-A.stderr similarity index 100% rename from morituri/test/cdparanoia/PX-L890SA.cdparanoia-A.stderr rename to whipper/test/cdparanoia/PX-L890SA.cdparanoia-A.stderr diff --git a/morituri/test/cdrdao.readtoc.progress b/whipper/test/cdrdao.readtoc.progress similarity index 100% rename from morituri/test/cdrdao.readtoc.progress rename to whipper/test/cdrdao.readtoc.progress diff --git a/morituri/test/common.py b/whipper/test/common.py similarity index 94% rename from morituri/test/common.py rename to whipper/test/common.py index 9eba5a6..64931b2 100644 --- a/morituri/test/common.py +++ b/whipper/test/common.py @@ -5,7 +5,7 @@ import re import os import sys -import morituri +import whipper # twisted's unittests have skip support, standard unittest don't from twisted.trial import unittest @@ -70,8 +70,8 @@ class TestCase(unittest.TestCase): ret = open(os.path.join(os.path.dirname(__file__), name)).read( ).decode('utf-8') ret = re.sub( - 'REM COMMENT "Morituri.*', - 'REM COMMENT "Morituri %s"' % (morituri.__version__), + 'REM COMMENT "whipper.*', + 'REM COMMENT "whipper %s"' % (whipper.__version__), ret, re.MULTILINE) return ret diff --git a/morituri/test/cure.cue b/whipper/test/cure.cue similarity index 97% rename from morituri/test/cure.cue rename to whipper/test/cure.cue index ad2395a..c31af3c 100644 --- a/morituri/test/cure.cue +++ b/whipper/test/cure.cue @@ -1,5 +1,5 @@ REM DISCID B90C650D -REM COMMENT "morituri 0.5.1" +REM COMMENT "whipper 0.5.1" CATALOG 0602517642256 FILE "data.wav" WAVE TRACK 01 AUDIO diff --git a/morituri/test/cure.toc b/whipper/test/cure.toc similarity index 100% rename from morituri/test/cure.toc rename to whipper/test/cure.toc diff --git a/morituri/test/dBAR-011-0010e284-009228a3-9809ff0b.bin b/whipper/test/dBAR-011-0010e284-009228a3-9809ff0b.bin similarity index 100% rename from morituri/test/dBAR-011-0010e284-009228a3-9809ff0b.bin rename to whipper/test/dBAR-011-0010e284-009228a3-9809ff0b.bin diff --git a/morituri/test/dBAR-020-002e5023-029d8e49-040eaa14.bin b/whipper/test/dBAR-020-002e5023-029d8e49-040eaa14.bin similarity index 100% rename from morituri/test/dBAR-020-002e5023-029d8e49-040eaa14.bin rename to whipper/test/dBAR-020-002e5023-029d8e49-040eaa14.bin diff --git a/morituri/test/jose.toc b/whipper/test/jose.toc similarity index 100% rename from morituri/test/jose.toc rename to whipper/test/jose.toc diff --git a/morituri/test/kanye.cue b/whipper/test/kanye.cue similarity index 100% rename from morituri/test/kanye.cue rename to whipper/test/kanye.cue diff --git a/morituri/test/kings-separate.cue b/whipper/test/kings-separate.cue similarity index 100% rename from morituri/test/kings-separate.cue rename to whipper/test/kings-separate.cue diff --git a/morituri/test/kings-single.cue b/whipper/test/kings-single.cue similarity index 100% rename from morituri/test/kings-single.cue rename to whipper/test/kings-single.cue diff --git a/morituri/test/ladyhawke.toc b/whipper/test/ladyhawke.toc similarity index 100% rename from morituri/test/ladyhawke.toc rename to whipper/test/ladyhawke.toc diff --git a/morituri/test/morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json b/whipper/test/morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json similarity index 100% rename from morituri/test/morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json rename to whipper/test/morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json diff --git a/morituri/test/morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json b/whipper/test/morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json similarity index 100% rename from morituri/test/morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json rename to whipper/test/morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json diff --git a/morituri/test/morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json b/whipper/test/morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json similarity index 100% rename from morituri/test/morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json rename to whipper/test/morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json diff --git a/morituri/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json b/whipper/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json similarity index 100% rename from morituri/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json rename to whipper/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json diff --git a/morituri/test/release.08397059-86c1-463b-8ed0-cd596dbd174f.xml b/whipper/test/release.08397059-86c1-463b-8ed0-cd596dbd174f.xml similarity index 100% rename from morituri/test/release.08397059-86c1-463b-8ed0-cd596dbd174f.xml rename to whipper/test/release.08397059-86c1-463b-8ed0-cd596dbd174f.xml diff --git a/morituri/test/release.93a6268c-ddf1-4898-bf93-fb862b1c5c5e.xml b/whipper/test/release.93a6268c-ddf1-4898-bf93-fb862b1c5c5e.xml similarity index 100% rename from morituri/test/release.93a6268c-ddf1-4898-bf93-fb862b1c5c5e.xml rename to whipper/test/release.93a6268c-ddf1-4898-bf93-fb862b1c5c5e.xml diff --git a/morituri/test/release.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml b/whipper/test/release.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml similarity index 100% rename from morituri/test/release.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml rename to whipper/test/release.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml diff --git a/morituri/test/silentalarm.result.pickle b/whipper/test/silentalarm.result.pickle similarity index 90% rename from morituri/test/silentalarm.result.pickle rename to whipper/test/silentalarm.result.pickle index 5a0e6b1..9ab6db6 100644 --- a/morituri/test/silentalarm.result.pickle +++ b/whipper/test/silentalarm.result.pickle @@ -1,5 +1,5 @@ (lp0 -(imorituri.result.result +(iwhipper.result.result TrackResult p1 (dp2 @@ -22,7 +22,7 @@ sS'filename' p8 V/home/thomas/Bloc Party - Silent Alarm/00. Bloc Party - Hidden Track One Audio.flac p9 -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p10 (dp11 @@ -57,7 +57,7 @@ p18 I15220 sg5 L1476997036L -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p19 (dp20 @@ -86,7 +86,7 @@ sg18 I0 sg5 L2118180996L -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p22 (dp23 @@ -115,7 +115,7 @@ sg18 I0 sg5 L2397618238L -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p25 (dp26 @@ -144,7 +144,7 @@ sg18 I0 sg5 L1340624205L -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p28 (dp29 @@ -173,7 +173,7 @@ sg18 I72 sg5 L183201985L -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p31 (dp32 @@ -202,7 +202,7 @@ sg18 I41 sg5 L221401921L -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p34 (dp35 @@ -231,7 +231,7 @@ sg18 I17 sg5 L3133726276L -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p37 (dp38 @@ -260,7 +260,7 @@ sg18 I4 sg5 L2318646110L -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p40 (dp41 @@ -289,7 +289,7 @@ sg18 I11 sg5 L3145161267L -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p43 (dp44 @@ -318,7 +318,7 @@ sg18 I0 sg5 L3022257630L -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p46 (dp47 @@ -347,7 +347,7 @@ sg18 I43 sg5 L2011827324L -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p49 (dp50 @@ -376,7 +376,7 @@ sg18 I116 sg5 L933582879L -sba(imorituri.result.result +sba(iwhipper.result.result TrackResult p52 (dp53 diff --git a/morituri/test/strokes-someday.eac.cue b/whipper/test/strokes-someday.eac.cue similarity index 100% rename from morituri/test/strokes-someday.eac.cue rename to whipper/test/strokes-someday.eac.cue diff --git a/morituri/test/strokes-someday.toc b/whipper/test/strokes-someday.toc similarity index 100% rename from morituri/test/strokes-someday.toc rename to whipper/test/strokes-someday.toc diff --git a/morituri/test/surferrosa.eac.corrected.cue b/whipper/test/surferrosa.eac.corrected.cue similarity index 100% rename from morituri/test/surferrosa.eac.corrected.cue rename to whipper/test/surferrosa.eac.corrected.cue diff --git a/morituri/test/surferrosa.eac.currentgap.cue b/whipper/test/surferrosa.eac.currentgap.cue similarity index 100% rename from morituri/test/surferrosa.eac.currentgap.cue rename to whipper/test/surferrosa.eac.currentgap.cue diff --git a/morituri/test/surferrosa.eac.leftout.cue b/whipper/test/surferrosa.eac.leftout.cue similarity index 100% rename from morituri/test/surferrosa.eac.leftout.cue rename to whipper/test/surferrosa.eac.leftout.cue diff --git a/morituri/test/surferrosa.eac.noncompliant.cue b/whipper/test/surferrosa.eac.noncompliant.cue similarity index 100% rename from morituri/test/surferrosa.eac.noncompliant.cue rename to whipper/test/surferrosa.eac.noncompliant.cue diff --git a/morituri/test/surferrosa.eac.single.cue b/whipper/test/surferrosa.eac.single.cue similarity index 100% rename from morituri/test/surferrosa.eac.single.cue rename to whipper/test/surferrosa.eac.single.cue diff --git a/morituri/test/surferrosa.toc b/whipper/test/surferrosa.toc similarity index 100% rename from morituri/test/surferrosa.toc rename to whipper/test/surferrosa.toc diff --git a/morituri/test/test_common_accurip.py b/whipper/test/test_common_accurip.py similarity index 84% rename from morituri/test/test_common_accurip.py rename to whipper/test/test_common_accurip.py index e5e957d..a61daae 100644 --- a/morituri/test/test_common_accurip.py +++ b/whipper/test/test_common_accurip.py @@ -1,11 +1,11 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_accurip -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_accurip -*- # vi:si:et:sw=4:sts=4:ts=4 import os -from morituri.common import accurip +from whipper.common import accurip -from morituri.test import common as tcommon +from whipper.test import common as tcommon class AccurateRipResponseTestCase(tcommon.TestCase): diff --git a/morituri/test/test_common_cache.py b/whipper/test/test_common_cache.py similarity index 76% rename from morituri/test/test_common_cache.py rename to whipper/test/test_common_cache.py index 55460a5..e0a7d23 100644 --- a/morituri/test/test_common_cache.py +++ b/whipper/test/test_common_cache.py @@ -1,11 +1,11 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_cache -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_cache -*- # vi:si:et:sw=4:sts=4:ts=4 import os -from morituri.common import cache +from whipper.common import cache -from morituri.test import common as tcommon +from whipper.test import common as tcommon class ResultCacheTestCase(tcommon.TestCase): diff --git a/morituri/test/test_common_common.py b/whipper/test/test_common_common.py similarity index 93% rename from morituri/test/test_common_common.py rename to whipper/test/test_common_common.py index de9e8a4..d515140 100644 --- a/morituri/test/test_common_common.py +++ b/whipper/test/test_common_common.py @@ -1,12 +1,12 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_common -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_common -*- # vi:si:et:sw=4:sts=4:ts=4 import os import tempfile -from morituri.common import common +from whipper.common import common -from morituri.test import common as tcommon +from whipper.test import common as tcommon class ShrinkTestCase(tcommon.TestCase): diff --git a/morituri/test/test_common_config.py b/whipper/test/test_common_config.py similarity index 93% rename from morituri/test/test_common_config.py rename to whipper/test/test_common_config.py index a90f8a1..d6edd67 100644 --- a/morituri/test/test_common_config.py +++ b/whipper/test/test_common_config.py @@ -1,12 +1,12 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_config -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_config -*- # vi:si:et:sw=4:sts=4:ts=4 import os import tempfile -from morituri.common import config +from whipper.common import config -from morituri.test import common as tcommon +from whipper.test import common as tcommon class ConfigTestCase(tcommon.TestCase): diff --git a/morituri/test/test_common_directory.py b/whipper/test/test_common_directory.py similarity index 65% rename from morituri/test/test_common_directory.py rename to whipper/test/test_common_directory.py index 3629115..c5a9dcf 100644 --- a/morituri/test/test_common_directory.py +++ b/whipper/test/test_common_directory.py @@ -1,9 +1,9 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_directory -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_directory -*- # vi:si:et:sw=4:sts=4:ts=4 -from morituri.common import directory +from whipper.common import directory -from morituri.test import common +from whipper.test import common class DirectoryTestCase(common.TestCase): diff --git a/morituri/test/test_common_drive.py b/whipper/test/test_common_drive.py similarity index 68% rename from morituri/test/test_common_drive.py rename to whipper/test/test_common_drive.py index 4732742..e3d13c4 100644 --- a/morituri/test/test_common_drive.py +++ b/whipper/test/test_common_drive.py @@ -1,8 +1,8 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_drive -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_drive -*- # vi:si:et:sw=4:sts=4:ts=4 -from morituri.test import common -from morituri.common import drive +from whipper.test import common +from whipper.common import drive class ListifyTestCase(common.TestCase): diff --git a/morituri/test/test_common_mbngs.py b/whipper/test/test_common_mbngs.py similarity index 97% rename from morituri/test/test_common_mbngs.py rename to whipper/test/test_common_mbngs.py index 6777bcc..008135b 100644 --- a/morituri/test/test_common_mbngs.py +++ b/whipper/test/test_common_mbngs.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_mbngs -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_mbngs -*- # vi:si:et:sw=4:sts=4:ts=4 import os @@ -6,7 +6,7 @@ import json import unittest -from morituri.common import mbngs +from whipper.common import mbngs class MetadataTestCase(unittest.TestCase): diff --git a/morituri/test/test_common_path.py b/whipper/test/test_common_path.py similarity index 85% rename from morituri/test/test_common_path.py rename to whipper/test/test_common_path.py index 84a66d3..bf7a552 100644 --- a/morituri/test/test_common_path.py +++ b/whipper/test/test_common_path.py @@ -1,9 +1,9 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_path -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_path -*- # vi:si:et:sw=4:sts=4:ts=4 -from morituri.common import path +from whipper.common import path -from morituri.test import common +from whipper.test import common class FilterTestCase(common.TestCase): diff --git a/morituri/test/test_common_program.py b/whipper/test/test_common_program.py similarity index 94% rename from morituri/test/test_common_program.py rename to whipper/test/test_common_program.py index 0cc4601..fd2eef1 100644 --- a/morituri/test/test_common_program.py +++ b/whipper/test/test_common_program.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_common_program -*- +# -*- Mode: Python; test-case-name: whipper.test.test_common_program -*- # vi:si:et:sw=4:sts=4:ts=4 @@ -7,9 +7,9 @@ import pickle import unittest -from morituri.result import result -from morituri.common import program, accurip, mbngs, config -from morituri.command.cd import DEFAULT_DISC_TEMPLATE +from whipper.result import result +from whipper.common import program, accurip, mbngs, config +from whipper.command.cd import DEFAULT_DISC_TEMPLATE class TrackImageVerifyTestCase(unittest.TestCase): diff --git a/morituri/test/test_common_renamer.py b/whipper/test/test_common_renamer.py similarity index 97% rename from morituri/test/test_common_renamer.py rename to whipper/test/test_common_renamer.py index 795d8d2..2122bfc 100644 --- a/morituri/test/test_common_renamer.py +++ b/whipper/test/test_common_renamer.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_image_cue -*- +# -*- Mode: Python; test-case-name: whipper.test.test_image_cue -*- # vi:si:et:sw=4:sts=4:ts=4 import os @@ -6,7 +6,7 @@ import tempfile import unittest -from morituri.common import renamer +from whipper.common import renamer class RenameInFileTestcase(unittest.TestCase): diff --git a/morituri/test/test_image_cue.py b/whipper/test/test_image_cue.py similarity index 91% rename from morituri/test/test_image_cue.py rename to whipper/test/test_image_cue.py index ba57e85..5e42d04 100644 --- a/morituri/test/test_image_cue.py +++ b/whipper/test/test_image_cue.py @@ -1,15 +1,15 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_image_cue -*- +# -*- Mode: Python; test-case-name: whipper.test.test_image_cue -*- # vi:si:et:sw=4:sts=4:ts=4 import os import tempfile import unittest -import morituri +import whipper -from morituri.image import table, cue +from whipper.image import table, cue -from morituri.test import common +from whipper.test import common class KingsSingleTestCase(unittest.TestCase): @@ -77,7 +77,7 @@ class WriteCueFileTestCase(unittest.TestCase): it.leadout = 3000 common.diffStrings(u"""REM DISCID 0C002802 -REM COMMENT "morituri %s" +REM COMMENT "whipper %s" FILE "track01.wav" WAVE TRACK 01 AUDIO INDEX 01 00:00:00 @@ -85,5 +85,5 @@ FILE "track01.wav" WAVE INDEX 00 00:13:25 FILE "track02.wav" WAVE INDEX 01 00:00:00 -""" % morituri.__version__, it.cue()) +""" % whipper.__version__, it.cue()) os.unlink(path) diff --git a/morituri/test/test_image_table.py b/whipper/test/test_image_table.py similarity index 95% rename from morituri/test/test_image_table.py rename to whipper/test/test_image_table.py index b75784e..c0b0038 100644 --- a/morituri/test/test_image_table.py +++ b/whipper/test/test_image_table.py @@ -1,9 +1,9 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_image_table -*- +# -*- Mode: Python; test-case-name: whipper.test.test_image_table -*- # vi:si:et:sw=4:sts=4:ts=4 -from morituri.image import table +from whipper.image import table -from morituri.test import common as tcommon +from whipper.test import common as tcommon def h(i): diff --git a/morituri/test/test_image_toc.py b/whipper/test/test_image_toc.py similarity index 99% rename from morituri/test/test_image_toc.py rename to whipper/test/test_image_toc.py index 04285d2..0942ec9 100644 --- a/morituri/test/test_image_toc.py +++ b/whipper/test/test_image_toc.py @@ -1,4 +1,4 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_image_toc -*- +# -*- Mode: Python; test-case-name: whipper.test.test_image_toc -*- # vi:si:et:sw=4:sts=4:ts=4 import os @@ -6,9 +6,9 @@ import copy import shutil import tempfile -from morituri.image import toc +from whipper.image import toc -from morituri.test import common +from whipper.test import common class CureTestCase(common.TestCase): diff --git a/morituri/test/test_program_cdparanoia.py b/whipper/test/test_program_cdparanoia.py similarity index 92% rename from morituri/test/test_program_cdparanoia.py rename to whipper/test/test_program_cdparanoia.py index 6c910b1..712864f 100644 --- a/morituri/test/test_program_cdparanoia.py +++ b/whipper/test/test_program_cdparanoia.py @@ -1,13 +1,13 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_program_cdparanoia -*- +# -*- Mode: Python; test-case-name: whipper.test.test_program_cdparanoia -*- # vi:si:et:sw=4:sts=4:ts=4 import os -from morituri.extern.task import task +from whipper.extern.task import task -from morituri.program import cdparanoia +from whipper.program import cdparanoia -from morituri.test import common +from whipper.test import common class ParseTestCase(common.TestCase): diff --git a/morituri/test/test_program_cdrdao.py b/whipper/test/test_program_cdrdao.py similarity index 69% rename from morituri/test/test_program_cdrdao.py rename to whipper/test/test_program_cdrdao.py index eeebb09..07a2e5c 100644 --- a/morituri/test/test_program_cdrdao.py +++ b/whipper/test/test_program_cdrdao.py @@ -1,11 +1,11 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_program_cdparanoia -*- +# -*- Mode: Python; test-case-name: whipper.test.test_program_cdparanoia -*- # vi:si:et:sw=4:sts=4:ts=4 import os -from morituri.program import cdrdao +from whipper.program import cdrdao -from morituri.test import common +from whipper.test import common # TODO: Current test architecture makes testing cdrdao difficult. Revisit. diff --git a/morituri/test/test_program_sox.py b/whipper/test/test_program_sox.py similarity index 63% rename from morituri/test/test_program_sox.py rename to whipper/test/test_program_sox.py index c79cbbc..a5cd6bb 100644 --- a/morituri/test/test_program_sox.py +++ b/whipper/test/test_program_sox.py @@ -1,9 +1,9 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_program_sox -*- +# -*- Mode: Python; test-case-name: whipper.test.test_program_sox -*- import os -from morituri.program import sox -from morituri.test import common +from whipper.program import sox +from whipper.test import common class PeakLevelTestCase(common.TestCase): def setUp(self): diff --git a/morituri/test/test_program_soxi.py b/whipper/test/test_program_soxi.py similarity index 88% rename from morituri/test/test_program_soxi.py rename to whipper/test/test_program_soxi.py index ae1e7da..b06e4f8 100644 --- a/morituri/test/test_program_soxi.py +++ b/whipper/test/test_program_soxi.py @@ -1,12 +1,12 @@ -# -*- Mode: Python; test-case-name: morituri.test.test_program_sox -*- +# -*- Mode: Python; test-case-name: whipper.test.test_program_sox -*- import os import tempfile -from morituri.common import common -from morituri.extern.task import task -from morituri.program.soxi import AudioLengthTask -from morituri.test import common as tcommon +from whipper.common import common +from whipper.extern.task import task +from whipper.program.soxi import AudioLengthTask +from whipper.test import common as tcommon base_track_file = os.path.join(os.path.dirname(__file__), u'track.flac') base_track_length = 10 * common.SAMPLES_PER_FRAME diff --git a/morituri/test/totbl.fast.toc b/whipper/test/totbl.fast.toc similarity index 100% rename from morituri/test/totbl.fast.toc rename to whipper/test/totbl.fast.toc diff --git a/morituri/test/track-separate.cue b/whipper/test/track-separate.cue similarity index 100% rename from morituri/test/track-separate.cue rename to whipper/test/track-separate.cue diff --git a/morituri/test/track-single.cue b/whipper/test/track-single.cue similarity index 100% rename from morituri/test/track-single.cue rename to whipper/test/track-single.cue diff --git a/morituri/test/track.flac b/whipper/test/track.flac similarity index 100% rename from morituri/test/track.flac rename to whipper/test/track.flac