Rename "morituri" module to "whipper".

Fixes https://github.com/JoeLametta/whipper/issues/100

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.

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

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

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

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'
          ]
     }
 )

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__)

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__)

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.
 

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)
 

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__)

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__)

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)

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__)

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__)

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__)

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__)

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__)

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__)

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

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

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__)

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

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

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' % (

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

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__)

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__)

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__)

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)

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__)

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))
 

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__)

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__)

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()

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

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

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"

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

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

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

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):

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):

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):

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):

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):

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):

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):