From a8af9b79abd03fb9060ca10d964ce2eb8bd2b8d3 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:09:13 +0200 Subject: [PATCH 1/7] s/morituri/whipper/ in GPL copyright blurbs. --- misc/header.py | 8 ++++---- morituri/command/accurip.py | 8 ++++---- morituri/command/cd.py | 8 ++++---- morituri/command/debug.py | 8 ++++---- morituri/command/drive.py | 8 ++++---- morituri/command/image.py | 8 ++++---- morituri/command/offset.py | 8 ++++---- morituri/common/accurip.py | 8 ++++---- morituri/common/cache.py | 8 ++++---- morituri/common/checksum.py | 8 ++++---- morituri/common/common.py | 8 ++++---- morituri/common/config.py | 8 ++++---- morituri/common/directory.py | 8 ++++---- morituri/common/drive.py | 8 ++++---- morituri/common/encode.py | 8 ++++---- morituri/common/mbngs.py | 8 ++++---- morituri/common/path.py | 8 ++++---- morituri/common/program.py | 8 ++++---- morituri/common/renamer.py | 8 ++++---- morituri/extern/task/task.py | 8 ++++---- morituri/image/cue.py | 8 ++++---- morituri/image/image.py | 8 ++++---- morituri/image/table.py | 8 ++++---- morituri/image/toc.py | 8 ++++---- morituri/program/cdparanoia.py | 8 ++++---- morituri/result/result.py | 8 ++++---- 26 files changed, 104 insertions(+), 104 deletions(-) diff --git a/misc/header.py b/misc/header.py index 15b83ba0..2bee413e 100644 --- a/misc/header.py +++ b/misc/header.py @@ -5,17 +5,17 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . diff --git a/morituri/command/accurip.py b/morituri/command/accurip.py index 09ae0875..e1b1868d 100644 --- a/morituri/command/accurip.py +++ b/morituri/command/accurip.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import sys diff --git a/morituri/command/cd.py b/morituri/command/cd.py index 38e03e05..58a4f798 100644 --- a/morituri/command/cd.py +++ b/morituri/command/cd.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import argparse import os diff --git a/morituri/command/debug.py b/morituri/command/debug.py index c6310db3..5d2b57f3 100644 --- a/morituri/command/debug.py +++ b/morituri/command/debug.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import argparse import sys diff --git a/morituri/command/drive.py b/morituri/command/drive.py index e8d44981..af1a2ad3 100644 --- a/morituri/command/drive.py +++ b/morituri/command/drive.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import sys diff --git a/morituri/command/image.py b/morituri/command/image.py index 606ed813..fde28f33 100644 --- a/morituri/command/image.py +++ b/morituri/command/image.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import os import sys diff --git a/morituri/command/offset.py b/morituri/command/offset.py index 065f2ea0..6fe9d75f 100644 --- a/morituri/command/offset.py +++ b/morituri/command/offset.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import argparse import os diff --git a/morituri/common/accurip.py b/morituri/common/accurip.py index e9fb31f0..1c5e5d81 100644 --- a/morituri/common/accurip.py +++ b/morituri/common/accurip.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import errno import os diff --git a/morituri/common/cache.py b/morituri/common/cache.py index 260abe18..d87de98a 100644 --- a/morituri/common/cache.py +++ b/morituri/common/cache.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import os import os.path diff --git a/morituri/common/checksum.py b/morituri/common/checksum.py index 9ed12a80..9a5de584 100644 --- a/morituri/common/checksum.py +++ b/morituri/common/checksum.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import binascii import wave diff --git a/morituri/common/common.py b/morituri/common/common.py index 641720f1..068dd256 100644 --- a/morituri/common/common.py +++ b/morituri/common/common.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import os diff --git a/morituri/common/config.py b/morituri/common/config.py index 66e23998..136e5e46 100644 --- a/morituri/common/config.py +++ b/morituri/common/config.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import ConfigParser import codecs diff --git a/morituri/common/directory.py b/morituri/common/directory.py index a15041e4..53e0e57c 100644 --- a/morituri/common/directory.py +++ b/morituri/common/directory.py @@ -5,20 +5,20 @@ # Copyright (C) 2013 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . from os import getenv, makedirs from os.path import join, expanduser, exists diff --git a/morituri/common/drive.py b/morituri/common/drive.py index f0e58679..62b89e29 100644 --- a/morituri/common/drive.py +++ b/morituri/common/drive.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import os diff --git a/morituri/common/encode.py b/morituri/common/encode.py index 4d3b69ad..28f489a7 100644 --- a/morituri/common/encode.py +++ b/morituri/common/encode.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . from mutagen.flac import FLAC diff --git a/morituri/common/mbngs.py b/morituri/common/mbngs.py index fb4d1e1a..1b7751ed 100644 --- a/morituri/common/mbngs.py +++ b/morituri/common/mbngs.py @@ -5,20 +5,20 @@ # Copyright (C) 2009, 2010, 2011 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . """ Handles communication with the musicbrainz server using NGS. diff --git a/morituri/common/path.py b/morituri/common/path.py index cb595aea..56f775bc 100644 --- a/morituri/common/path.py +++ b/morituri/common/path.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import re diff --git a/morituri/common/program.py b/morituri/common/program.py index cc5bbaf2..e69706e6 100644 --- a/morituri/common/program.py +++ b/morituri/common/program.py @@ -5,20 +5,20 @@ # Copyright (C) 2009, 2010, 2011 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . """ Common functionality and class for all programs using morituri. diff --git a/morituri/common/renamer.py b/morituri/common/renamer.py index 03730647..18ab98b1 100644 --- a/morituri/common/renamer.py +++ b/morituri/common/renamer.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import os import tempfile diff --git a/morituri/extern/task/task.py b/morituri/extern/task/task.py index da4639af..05f9f4ce 100644 --- a/morituri/extern/task/task.py +++ b/morituri/extern/task/task.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import sys diff --git a/morituri/image/cue.py b/morituri/image/cue.py index c774ccf5..934f0c54 100644 --- a/morituri/image/cue.py +++ b/morituri/image/cue.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . """ Reading .cue files diff --git a/morituri/image/image.py b/morituri/image/image.py index d2f2b92c..31f6beb0 100644 --- a/morituri/image/image.py +++ b/morituri/image/image.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . """ Wrap on-disk CD images based on the .cue file. diff --git a/morituri/image/table.py b/morituri/image/table.py index fbd7cc04..28e2aff6 100644 --- a/morituri/image/table.py +++ b/morituri/image/table.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . """ Wrap Table of Contents. diff --git a/morituri/image/toc.py b/morituri/image/toc.py index 45ae12ff..2bf73044 100644 --- a/morituri/image/toc.py +++ b/morituri/image/toc.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . """ Reading .toc files diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py index b2321ade..b6744613 100644 --- a/morituri/program/cdparanoia.py +++ b/morituri/program/cdparanoia.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import errno import os diff --git a/morituri/result/result.py b/morituri/result/result.py index 52e5f47a..14876774 100644 --- a/morituri/result/result.py +++ b/morituri/result/result.py @@ -5,20 +5,20 @@ # Copyright (C) 2009 Thomas Vander Stichele -# This file is part of morituri. +# This file is part of whipper. # -# morituri is free software: you can redistribute it and/or modify +# whipper is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# morituri is distributed in the hope that it will be useful, +# whipper is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with morituri. If not, see . +# along with whipper. If not, see . import pkg_resources import time 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 2/7] 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 8a9c5a3a..420eeb42 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 c115c2c3..77a518a5 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 2bee413e..46d9c741 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 8f63c7b8..697f40f7 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 99856752..9262a8de 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 @@ 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 e1b1868d..c55db1db 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 563dde03..8e96a21c 100644 --- a/morituri/command/basecommand.py +++ b/whipper/command/basecommand.py @@ -5,7 +5,7 @@ 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 58a4f798..937d8463 100644 --- a/morituri/command/cd.py +++ b/whipper/command/cd.py @@ -30,12 +30,12 @@ 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 @@ def add_arguments(self): 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 5d2b57f3..e02e31cf 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 @@ def add_arguments(self): 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 @@ def add_arguments(self): 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 @@ def do(self): 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 @@ def do(self): 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 af1a2ad3..3a69e8c9 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 fde28f33..313163d4 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 03ea106e..0219591d 100644 --- a/morituri/command/main.py +++ b/whipper/command/main.py @@ -6,20 +6,20 @@ 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 @@ def handle_arguments(self): 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 6fe9d75f..4a8734f6 100644 --- a/morituri/command/offset.py +++ b/whipper/command/offset.py @@ -28,13 +28,13 @@ 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 1c5e5d81..e8df484d 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 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 d87de98a..874fc3f2 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 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 9a5de584..3d6daeaa 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 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 068dd256..1dd47d6e 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 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 136e5e46..f89c3b55 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 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 53e0e57c..e38cf60a 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 62b89e29..be8fc364 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 28f489a7..062ee397 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 1b7751ed..b6341468 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 56f775bc..1c5718ae 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 e69706e6..e8a4721f 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 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 @@ def getCDDB(self, cddbdiscid): 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 18ab98b1..177d6e75 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 24197042..e1f4bcfa 100644 --- a/morituri/common/task.py +++ b/whipper/common/task.py @@ -5,8 +5,8 @@ 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 934f0c54..9ab07298 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 @@ 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 31f6beb0..6d4e7aff 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 @@ 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 28e2aff6..c4bffb92 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 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 @@ def getAccurateRipURL(self): 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 @@ def writeFile(path): 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 2bf73044..2dde18d2 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 @@ 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 b6744613..205e35e7 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 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 @@ def __init__(self, path, table, start, stop, overread, offset=0, 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 @@ def __init__(self, path, table, start, stop, overread, offset=0, 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 682d1a6d..037588fa 100644 --- a/morituri/program/cdrdao.py +++ b/whipper/program/cdrdao.py @@ -3,8 +3,8 @@ 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 36fb03a7..650e1443 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 fbd3505b..33792644 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 @@ def logRip(self, ripResult, epoch): # 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 14876774..5b9a3950 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 @@ def log(self, ripResult, epoch=time.time()): 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 c1be8a61..16d08edc 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 4b3e358c..e55a56de 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 9eba5a61..64931b20 100644 --- a/morituri/test/common.py +++ b/whipper/test/common.py @@ -5,7 +5,7 @@ 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 @@ def readCue(self, name): 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 ad2395aa..c31af3c8 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 5a0e6b13..9ab6db62 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 e5e957dd..a61daaef 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 55460a5b..e0a7d23b 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 de9e8a43..d5151400 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 a90f8a17..d6edd67b 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 3629115e..c5a9dcf8 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 4732742c..e3d13c49 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 6777bccd..008135ba 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 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 84a66d3d..bf7a5529 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 0cc4601a..fd2eef18 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 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 795d8d20..2122bfce 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 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 ba57e851..5e42d042 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 @@ def testWrite(self): 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 @@ def testWrite(self): 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 b75784ed..c0b0038a 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 04285d2b..0942ec9e 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 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 6c910b1f..712864f6 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 eeebb093..07a2e5ce 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 c79cbbc3..a5cd6bb8 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 ae1e7da0..b06e4f86 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 From cb0042c83298256cb211216769f02af5a443c9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Thu, 12 Jan 2017 18:30:49 +0100 Subject: [PATCH 3/7] Update morituri references in inline documentation. --- whipper/command/basecommand.py | 2 +- whipper/command/cd.py | 2 +- whipper/common/encode.py | 2 +- whipper/common/program.py | 2 +- whipper/program/flac.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/whipper/command/basecommand.py b/whipper/command/basecommand.py index 8e96a21c..86c419fd 100644 --- a/whipper/command/basecommand.py +++ b/whipper/command/basecommand.py @@ -67,7 +67,7 @@ def __init__(self, argv, prog_name, opts): if not drives: msg = 'No CD-DA drives found!' logger.critical(msg) - # morituri exited with return code 3 here + # whipper exited with return code 3 here raise IOError(msg) self.parser.add_argument('-d', '--device', action="store", diff --git a/whipper/command/cd.py b/whipper/command/cd.py index 937d8463..c01fb3a7 100644 --- a/whipper/command/cd.py +++ b/whipper/command/cd.py @@ -274,7 +274,7 @@ def add_arguments(self): help="output directory; will be included in file paths in log") self.parser.add_argument('-W', '--working-directory', action="store", dest="working_directory", - help="working directory; morituri will change to this directory " + help="working directory; whipper will change to this directory " "and files will be created relative to it when not absolute") self.parser.add_argument('--track-template', action="store", dest="track_template", diff --git a/whipper/common/encode.py b/whipper/common/encode.py index 062ee397..b76f5dca 100644 --- a/whipper/common/encode.py +++ b/whipper/common/encode.py @@ -65,7 +65,7 @@ def _flac_encode(self): # TODO: Wizzup: Do we really want this as 'Task'...? # I only made it a task for now because that it's easier to integrate in -# program/cdparanoia.py - where morituri currently does the tagging. +# program/cdparanoia.py - where whipper currently does the tagging. # We should just move the tagging to a more sensible place. class TaggingTask(task.Task): description = 'Writing tags to FLAC' diff --git a/whipper/common/program.py b/whipper/common/program.py index e8a4721f..1d0d2cbe 100644 --- a/whipper/common/program.py +++ b/whipper/common/program.py @@ -21,7 +21,7 @@ # along with whipper. If not, see . """ -Common functionality and class for all programs using morituri. +Common functionality and class for all programs using whipper. """ import musicbrainzngs diff --git a/whipper/program/flac.py b/whipper/program/flac.py index d83162b3..1db961d2 100644 --- a/whipper/program/flac.py +++ b/whipper/program/flac.py @@ -6,7 +6,7 @@ def encode(infile, outfile): """ Encodes infile to outfile, with flac. - Uses '-f' because morituri already creates the file. + Uses '-f' because whipper already creates the file. """ try: # TODO: Replace with Popen so that we can catch stderr and write it to From 494a86d607efe50ba2f7f4d242499d36623db558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Thu, 12 Jan 2017 18:46:57 +0100 Subject: [PATCH 4/7] Rename default logger. --- whipper/command/cd.py | 2 +- whipper/command/debug.py | 2 +- whipper/result/logger.py | 2 +- whipper/result/result.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/whipper/command/cd.py b/whipper/command/cd.py index c01fb3a7..7ec864ff 100644 --- a/whipper/command/cd.py +++ b/whipper/command/cd.py @@ -257,7 +257,7 @@ def add_arguments(self): _CD.add_arguments(self.parser) self.parser.add_argument('-L', '--logger', - action="store", dest="logger", default='morituri', + action="store", dest="logger", default='whipper', help="logger to use (choose from '" + "', '".join(loggers) + "')") # FIXME: get from config self.parser.add_argument('-o', '--offset', diff --git a/whipper/command/debug.py b/whipper/command/debug.py index e02e31cf..e9683f64 100644 --- a/whipper/command/debug.py +++ b/whipper/command/debug.py @@ -89,7 +89,7 @@ def add_arguments(self): self.parser.add_argument( '-L', '--logger', action="store", dest="logger", - default='morituri', + default='whipper', help="logger to use (choose from '" + "', '".join(loggers) + "')" ) diff --git a/whipper/result/logger.py b/whipper/result/logger.py index 33792644..9adfebf3 100644 --- a/whipper/result/logger.py +++ b/whipper/result/logger.py @@ -7,7 +7,7 @@ from whipper.result import result -class MorituriLogger(result.Logger): +class WhipperLogger(result.Logger): _accuratelyRipped = 0 _inARDatabase = 0 diff --git a/whipper/result/result.py b/whipper/result/result.py index 5b9a3950..6dcbe9aa 100644 --- a/whipper/result/result.py +++ b/whipper/result/result.py @@ -153,7 +153,7 @@ class EntryPoint(object): def load(self): from whipper.result import logger - return logger.MorituriLogger + return logger.WhipperLogger def getLoggers(): From c719d9c0779517b5e477806251b223b957b97a17 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 17:09:30 +0200 Subject: [PATCH 5/7] Update filenames. Note that the (internal) file names of "whipper/test/cache/result/fe105a11.pickle" did not get updated, since that breaks the tests for some reason. --- doc/.gitignore | 4 ++-- doc/Makefile.am | 12 ++++++------ misc/{morituri-uninstalled => whipper-uninstalled} | 0 whipper/command/offset.py | 2 +- whipper/common/cache.py | 2 +- whipper/common/config.py | 2 +- whipper/common/mbngs.py | 2 +- whipper/common/renamer.py | 2 +- whipper/program/cdparanoia.py | 4 ++-- whipper/test/common.py | 2 +- whipper/test/test_common_common.py | 2 +- whipper/test/test_common_config.py | 2 +- whipper/test/test_common_mbngs.py | 8 ++++---- whipper/test/test_common_renamer.py | 12 ++++++------ whipper/test/test_image_cue.py | 2 +- whipper/test/test_image_toc.py | 2 +- whipper/test/test_program_soxi.py | 6 +++--- ...elease.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json} | 0 ...elease.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json} | 0 ...elease.a76714e0-32b1-4ed4-b28e-f86d99642193.json} | 0 ...elease.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json} | 0 21 files changed, 33 insertions(+), 33 deletions(-) rename misc/{morituri-uninstalled => whipper-uninstalled} (100%) rename whipper/test/{morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json => whipper.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json} (100%) rename whipper/test/{morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json => whipper.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json} (100%) rename whipper/test/{morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json => whipper.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json} (100%) rename whipper/test/{morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json => whipper.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json} (100%) diff --git a/doc/.gitignore b/doc/.gitignore index bdb5ae53..02b12366 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,4 +1,4 @@ -morituri.ics -morituri.rss2 +whipper.ics +whipper.rss2 reference rip.1 diff --git a/doc/Makefile.am b/doc/Makefile.am index 77a518a5..9a31b5d2 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = morituri.rss2 morituri.ics $(man_MANS) +EXTRA_DIST = whipper.rss2 whipper.ics $(man_MANS) DISTCLEANFILES = $(man_MANS) all-local: feeds reference @@ -12,14 +12,14 @@ reference: endif # generate feeds -feeds: morituri.rss2 morituri.ics +feeds: whipper.rss2 whipper.ics # don't fail fatally if user does not have RDF -morituri.rss2: $(top_srcdir)/morituri.doap - -moap doap -f $(top_srcdir)/morituri.doap rss > morituri.rss2 +whipper.rss2: $(top_srcdir)/whipper.doap + -moap doap -f $(top_srcdir)/whipper.doap rss > whipper.rss2 -morituri.ics: $(top_srcdir)/morituri.doap - -moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics +whipper.ics: $(top_srcdir)/whipper.doap + -moap doap -f $(top_srcdir)/whipper.doap ical > whipper.ics man_MANS = rip.1 diff --git a/misc/morituri-uninstalled b/misc/whipper-uninstalled similarity index 100% rename from misc/morituri-uninstalled rename to misc/whipper-uninstalled diff --git a/whipper/command/offset.py b/whipper/command/offset.py index 4a8734f6..db47fe1b 100644 --- a/whipper/command/offset.py +++ b/whipper/command/offset.py @@ -198,7 +198,7 @@ def _arcs(self, runner, table, track, offset): logger.debug('Ripping track %r with offset %d ...', track, offset) fd, path = tempfile.mkstemp( - suffix=u'.track%02d.offset%d.morituri.wav' % ( + suffix=u'.track%02d.offset%d.whipper.wav' % ( track, offset)) os.close(fd) diff --git a/whipper/common/cache.py b/whipper/common/cache.py index 874fc3f2..3f071105 100644 --- a/whipper/common/cache.py +++ b/whipper/common/cache.py @@ -81,7 +81,7 @@ def persist(self, obj=None): # pickle self.object = obj - (fd, path) = tempfile.mkstemp(suffix='.morituri.pickle') + (fd, path) = tempfile.mkstemp(suffix='.whipper.pickle') handle = os.fdopen(fd, 'wb') import pickle pickle.dump(obj, handle, 2) diff --git a/whipper/common/config.py b/whipper/common/config.py index f89c3b55..b567932d 100644 --- a/whipper/common/config.py +++ b/whipper/common/config.py @@ -51,7 +51,7 @@ def open(self): len(self._parser.sections())) def write(self): - fd, path = tempfile.mkstemp(suffix=u'.moriturirc') + fd, path = tempfile.mkstemp(suffix=u'.whipperrc') handle = os.fdopen(fd, 'w') self._parser.write(handle) handle.close() diff --git a/whipper/common/mbngs.py b/whipper/common/mbngs.py index b6341468..a5c4e02a 100644 --- a/whipper/common/mbngs.py +++ b/whipper/common/mbngs.py @@ -90,7 +90,7 @@ def _record(record, which, name, what): # optionally record to disc as a JSON serialization if record: import json - filename = 'morituri.%s.%s.json' % (which, name) + filename = 'whipper.%s.%s.json' % (which, name) handle = open(filename, 'w') handle.write(json.dumps(what)) handle.close() diff --git a/whipper/common/renamer.py b/whipper/common/renamer.py index 177d6e75..042e38a4 100644 --- a/whipper/common/renamer.py +++ b/whipper/common/renamer.py @@ -201,7 +201,7 @@ def verify(self): def do(self): with open(self._path) as handle: - (fd, name) = tempfile.mkstemp(suffix='.morituri') + (fd, name) = tempfile.mkstemp(suffix='.whipper') for s in handle: os.write(fd, s.replace(self._source, self._destination)) diff --git a/whipper/program/cdparanoia.py b/whipper/program/cdparanoia.py index 205e35e7..4ca1a29b 100644 --- a/whipper/program/cdparanoia.py +++ b/whipper/program/cdparanoia.py @@ -454,7 +454,7 @@ def __init__(self, path, table, start, stop, overread, offset=0, if taglist: logger.debug('read and verify with taglist %r', taglist) # FIXME: choose a dir on the same disk/dir as the final path - fd, tmppath = tempfile.mkstemp(suffix='.morituri.wav') + fd, tmppath = tempfile.mkstemp(suffix='.whipper.wav') tmppath = unicode(tmppath) os.close(fd) self._tmpwavpath = tmppath @@ -581,7 +581,7 @@ class AnalyzeTask(ctask.PopenTask): def __init__(self, device=None): # cdparanoia -A *always* writes cdparanoia.log - self.cwd = tempfile.mkdtemp(suffix='.morituri.cache') + self.cwd = tempfile.mkdtemp(suffix='.whipper.cache') self.command = ['cdparanoia', '-A'] if device: self.command += ['-d', device] diff --git a/whipper/test/common.py b/whipper/test/common.py index 64931b20..fb0833f0 100644 --- a/whipper/test/common.py +++ b/whipper/test/common.py @@ -80,7 +80,7 @@ class UnicodeTestMixin: # A helper mixin to skip tests if we're not in a UTF-8 locale try: - os.stat(u'morituri.test.B\xeate Noire.empty') + os.stat(u'whipper.test.B\xeate Noire.empty') except UnicodeEncodeError: skip = 'No UTF-8 locale' except OSError: diff --git a/whipper/test/test_common_common.py b/whipper/test/test_common_common.py index d5151400..91fc6680 100644 --- a/whipper/test/test_common_common.py +++ b/whipper/test/test_common_common.py @@ -12,7 +12,7 @@ class ShrinkTestCase(tcommon.TestCase): def testSufjan(self): - path = (u'morituri/Sufjan Stevens - Illinois/02. Sufjan Stevens - ' + path = (u'whipper/Sufjan Stevens - Illinois/02. Sufjan Stevens - ' 'The Black Hawk War, or, How to Demolish an Entire ' 'Civilization and Still Feel Good About Yourself in the ' 'Morning, or, We Apologize for the Inconvenience but ' diff --git a/whipper/test/test_common_config.py b/whipper/test/test_common_config.py index d6edd67b..0a0d3849 100644 --- a/whipper/test/test_common_config.py +++ b/whipper/test/test_common_config.py @@ -12,7 +12,7 @@ class ConfigTestCase(tcommon.TestCase): def setUp(self): - fd, self._path = tempfile.mkstemp(suffix=u'.morituri.test.config') + fd, self._path = tempfile.mkstemp(suffix=u'.whipper.test.config') os.close(fd) self._config = config.Config(self._path) diff --git a/whipper/test/test_common_mbngs.py b/whipper/test/test_common_mbngs.py index 008135ba..5127c38d 100644 --- a/whipper/test/test_common_mbngs.py +++ b/whipper/test/test_common_mbngs.py @@ -14,7 +14,7 @@ class MetadataTestCase(unittest.TestCase): # Generated with rip -R cd info def testJeffEverybodySingle(self): path = os.path.join(os.path.dirname(__file__), - 'morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json') + 'whipper.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json') handle = open(path, "rb") response = json.loads(handle.read()) handle.close() @@ -27,7 +27,7 @@ def testJeffEverybodySingle(self): def test2MeterSessies10(self): # various artists, multiple artists per track path = os.path.join(os.path.dirname(__file__), - 'morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json') + 'whipper.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json') handle = open(path, "rb") response = json.loads(handle.read()) handle.close() @@ -55,7 +55,7 @@ def test2MeterSessies10(self): def testBalladOfTheBrokenSeas(self): # various artists disc path = os.path.join(os.path.dirname(__file__), - 'morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json') + 'whipper.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json') handle = open(path, "rb") response = json.loads(handle.read()) handle.close() @@ -88,7 +88,7 @@ def testMalaInCuba(self): # single artist disc, but with multiple artists tracks # see https://github.com/thomasvs/morituri/issues/19 path = os.path.join(os.path.dirname(__file__), - 'morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json') + 'whipper.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json') handle = open(path, "rb") response = json.loads(handle.read()) handle.close() diff --git a/whipper/test/test_common_renamer.py b/whipper/test/test_common_renamer.py index 2122bfce..b99f48aa 100644 --- a/whipper/test/test_common_renamer.py +++ b/whipper/test/test_common_renamer.py @@ -12,7 +12,7 @@ class RenameInFileTestcase(unittest.TestCase): def setUp(self): - (fd, self._path) = tempfile.mkstemp(suffix='.morituri.renamer.infile') + (fd, self._path) = tempfile.mkstemp(suffix='.whipper.renamer.infile') os.write(fd, 'This is a test\nThis is another\n') os.close(fd) @@ -42,11 +42,11 @@ def testSerialize(self): class RenameFileTestcase(unittest.TestCase): def setUp(self): - (fd, self._source) = tempfile.mkstemp(suffix='.morituri.renamer.file') + (fd, self._source) = tempfile.mkstemp(suffix='.whipper.renamer.file') os.write(fd, 'This is a test\nThis is another\n') os.close(fd) (fd, self._destination) = tempfile.mkstemp( - suffix='.morituri.renamer.file') + suffix='.whipper.renamer.file') os.close(fd) os.unlink(self._destination) self._operation = renamer.RenameFile(self._source, self._destination) @@ -82,15 +82,15 @@ def testSerialize(self): class OperatorTestCase(unittest.TestCase): def setUp(self): - self._statePath = tempfile.mkdtemp(suffix='.morituri.renamer.operator') + self._statePath = tempfile.mkdtemp(suffix='.whipper.renamer.operator') self._operator = renamer.Operator(self._statePath, 'test') (fd, self._source) = tempfile.mkstemp( - suffix='.morituri.renamer.operator') + suffix='.whipper.renamer.operator') os.write(fd, 'This is a test\nThis is another\n') os.close(fd) (fd, self._destination) = tempfile.mkstemp( - suffix='.morituri.renamer.operator') + suffix='.whipper.renamer.operator') os.close(fd) os.unlink(self._destination) self._operator.addOperation( diff --git a/whipper/test/test_image_cue.py b/whipper/test/test_image_cue.py index 5e42d042..b30b2c5b 100644 --- a/whipper/test/test_image_cue.py +++ b/whipper/test/test_image_cue.py @@ -59,7 +59,7 @@ def testGetTrackLength(self): class WriteCueFileTestCase(unittest.TestCase): def testWrite(self): - fd, path = tempfile.mkstemp(suffix=u'.morituri.test.cue') + fd, path = tempfile.mkstemp(suffix=u'.whipper.test.cue') os.close(fd) it = table.Table() diff --git a/whipper/test/test_image_toc.py b/whipper/test/test_image_toc.py index 0942ec9e..c2f16ba3 100644 --- a/whipper/test/test_image_toc.py +++ b/whipper/test/test_image_toc.py @@ -98,7 +98,7 @@ def testConvertCue(self): def testGetRealPath(self): self.assertRaises(KeyError, self.toc.getRealPath, u'track01.wav') - (fd, path) = tempfile.mkstemp(suffix=u'.morituri.test.wav') + (fd, path) = tempfile.mkstemp(suffix=u'.whipper.test.wav') self.assertEquals(self.toc.getRealPath(path), path) winpath = path.replace('/', '\\') diff --git a/whipper/test/test_program_soxi.py b/whipper/test/test_program_soxi.py index b06e4f86..ac98da47 100644 --- a/whipper/test/test_program_soxi.py +++ b/whipper/test/test_program_soxi.py @@ -37,12 +37,12 @@ def _testSuffix(self, suffix): class NormalAudioLengthPathTestCase(AudioLengthPathTestCase): def testSingleQuote(self): - self._testSuffix(u"morituri.test.Guns 'N Roses.flac") + self._testSuffix(u"whipper.test.Guns 'N Roses.flac") def testDoubleQuote(self): # This test makes sure we can checksum files with double quote in # their name - self._testSuffix(u'morituri.test.12" edit.flac') + self._testSuffix(u'whipper.test.12" edit.flac') class UnicodeAudioLengthPathTestCase(AudioLengthPathTestCase, @@ -50,7 +50,7 @@ class UnicodeAudioLengthPathTestCase(AudioLengthPathTestCase, def testUnicodePath(self): # this test makes sure we can checksum a unicode path - self._testSuffix(u'morituri.test.B\xeate Noire.empty.flac') + self._testSuffix(u'whipper.test.B\xeate Noire.empty.flac') class AbsentFileAudioLengthPathTestCase(AudioLengthPathTestCase): def testAbsentFile(self): diff --git a/whipper/test/morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json b/whipper/test/whipper.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json similarity index 100% rename from whipper/test/morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json rename to whipper/test/whipper.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json diff --git a/whipper/test/morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json b/whipper/test/whipper.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json similarity index 100% rename from whipper/test/morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json rename to whipper/test/whipper.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json diff --git a/whipper/test/morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json b/whipper/test/whipper.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json similarity index 100% rename from whipper/test/morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json rename to whipper/test/whipper.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json diff --git a/whipper/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json b/whipper/test/whipper.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json similarity index 100% rename from whipper/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json rename to whipper/test/whipper.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json From a20c25258d64373197710c25d57fe3a78523f528 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 17:12:25 +0200 Subject: [PATCH 6/7] Remove "Morituri - for those about to RIP" lines. --- misc/header.py | 2 -- whipper/command/accurip.py | 2 -- whipper/command/cd.py | 2 -- whipper/command/debug.py | 2 -- whipper/command/drive.py | 2 -- whipper/command/image.py | 2 -- whipper/command/offset.py | 2 -- whipper/common/accurip.py | 2 -- whipper/common/cache.py | 2 -- whipper/common/checksum.py | 2 -- whipper/common/common.py | 2 -- whipper/common/config.py | 2 -- whipper/common/directory.py | 2 -- whipper/common/drive.py | 2 -- whipper/common/encode.py | 2 -- whipper/common/mbngs.py | 2 -- whipper/common/path.py | 2 -- whipper/common/program.py | 2 -- whipper/common/renamer.py | 2 -- whipper/extern/task/task.py | 2 -- whipper/image/cue.py | 2 -- whipper/image/image.py | 2 -- whipper/image/table.py | 2 -- whipper/image/toc.py | 2 -- whipper/program/cdparanoia.py | 2 -- whipper/result/result.py | 2 -- 26 files changed, 52 deletions(-) diff --git a/misc/header.py b/misc/header.py index 46d9c741..a7322f4d 100644 --- a/misc/header.py +++ b/misc/header.py @@ -1,8 +1,6 @@ # -*- Mode: Python; test-case-name: whipper.test.test_header -*- # vi:si:et:sw=4:sts=4:ts=4 -# Morituri - for those about to RIP - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/command/accurip.py b/whipper/command/accurip.py index c55db1db..56ea4708 100644 --- a/whipper/command/accurip.py +++ b/whipper/command/accurip.py @@ -1,8 +1,6 @@ # -*- Mode: Python -*- # vi:si:et:sw=4:sts=4:ts=4 -# Morituri - for those about to RIP - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/command/cd.py b/whipper/command/cd.py index 7ec864ff..15af8b0f 100644 --- a/whipper/command/cd.py +++ b/whipper/command/cd.py @@ -1,8 +1,6 @@ # -*- Mode: Python -*- # vi:si:et:sw=4:sts=4:ts=4 -# Morituri - for those about to RIP - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/command/debug.py b/whipper/command/debug.py index e9683f64..28d99df1 100644 --- a/whipper/command/debug.py +++ b/whipper/command/debug.py @@ -1,8 +1,6 @@ # -*- Mode: Python -*- # vi:si:et:sw=4:sts=4:ts=4 -# Morituri - for those about to RIP - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/command/drive.py b/whipper/command/drive.py index 3a69e8c9..3af5cbf0 100644 --- a/whipper/command/drive.py +++ b/whipper/command/drive.py @@ -1,8 +1,6 @@ # -*- Mode: Python -*- # vi:si:et:sw=4:sts=4:ts=4 -# Morituri - for those about to RIP - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/command/image.py b/whipper/command/image.py index 313163d4..94c12c31 100644 --- a/whipper/command/image.py +++ b/whipper/command/image.py @@ -1,8 +1,6 @@ # -*- Mode: Python -*- # vi:si:et:sw=4:sts=4:ts=4 -# Morituri - for those about to RIP - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/command/offset.py b/whipper/command/offset.py index db47fe1b..b4223edc 100644 --- a/whipper/command/offset.py +++ b/whipper/command/offset.py @@ -1,8 +1,6 @@ # -*- Mode: Python -*- # vi:si:et:sw=4:sts=4:ts=4 -# Morituri - for those about to RIP - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/common/accurip.py b/whipper/common/accurip.py index e8df484d..1ff2e03a 100644 --- a/whipper/common/accurip.py +++ b/whipper/common/accurip.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/common/cache.py b/whipper/common/cache.py index 3f071105..6e5e4e64 100644 --- a/whipper/common/cache.py +++ b/whipper/common/cache.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/common/checksum.py b/whipper/common/checksum.py index 3d6daeaa..17dd8981 100644 --- a/whipper/common/checksum.py +++ b/whipper/common/checksum.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/common/common.py b/whipper/common/common.py index 1dd47d6e..1fe563f7 100644 --- a/whipper/common/common.py +++ b/whipper/common/common.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/common/config.py b/whipper/common/config.py index b567932d..9c75d28e 100644 --- a/whipper/common/config.py +++ b/whipper/common/config.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/common/directory.py b/whipper/common/directory.py index e38cf60a..42942d65 100644 --- a/whipper/common/directory.py +++ b/whipper/common/directory.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2013 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/common/drive.py b/whipper/common/drive.py index be8fc364..b20642a9 100644 --- a/whipper/common/drive.py +++ b/whipper/common/drive.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/common/encode.py b/whipper/common/encode.py index b76f5dca..309c5816 100644 --- a/whipper/common/encode.py +++ b/whipper/common/encode.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/common/mbngs.py b/whipper/common/mbngs.py index a5c4e02a..a066d641 100644 --- a/whipper/common/mbngs.py +++ b/whipper/common/mbngs.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009, 2010, 2011 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/common/path.py b/whipper/common/path.py index 1c5718ae..6b1ff514 100644 --- a/whipper/common/path.py +++ b/whipper/common/path.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/common/program.py b/whipper/common/program.py index 1d0d2cbe..d4978b58 100644 --- a/whipper/common/program.py +++ b/whipper/common/program.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009, 2010, 2011 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/common/renamer.py b/whipper/common/renamer.py index 042e38a4..c71a1367 100644 --- a/whipper/common/renamer.py +++ b/whipper/common/renamer.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/extern/task/task.py b/whipper/extern/task/task.py index 05f9f4ce..30c0ed2d 100644 --- a/whipper/extern/task/task.py +++ b/whipper/extern/task/task.py @@ -1,8 +1,6 @@ # -*- Mode: Python -*- # vi:si:et:sw=4:sts=4:ts=4 -# Morituri - for those about to RIP - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/image/cue.py b/whipper/image/cue.py index 9ab07298..e8a87ed6 100644 --- a/whipper/image/cue.py +++ b/whipper/image/cue.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/image/image.py b/whipper/image/image.py index 6d4e7aff..90d5869f 100644 --- a/whipper/image/image.py +++ b/whipper/image/image.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/image/table.py b/whipper/image/table.py index c4bffb92..b9909e65 100644 --- a/whipper/image/table.py +++ b/whipper/image/table.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/image/toc.py b/whipper/image/toc.py index 2dde18d2..25d00d42 100644 --- a/whipper/image/toc.py +++ b/whipper/image/toc.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/program/cdparanoia.py b/whipper/program/cdparanoia.py index 4ca1a29b..81e7281f 100644 --- a/whipper/program/cdparanoia.py +++ b/whipper/program/cdparanoia.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. diff --git a/whipper/result/result.py b/whipper/result/result.py index 6dcbe9aa..0c128744 100644 --- a/whipper/result/result.py +++ b/whipper/result/result.py @@ -1,8 +1,6 @@ # -*- 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 - # Copyright (C) 2009 Thomas Vander Stichele # This file is part of whipper. From 185fff3e069b5499dc2d7ca716c89cd778fe53f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20L=C3=B6nnemark?= Date: Thu, 27 Apr 2017 00:17:53 +0200 Subject: [PATCH 7/7] Fix fe105a11.pickle > Loaded and re-saved in a different pickle format (the initial format). > After that it's just search/replace --- whipper/test/cache/result/fe105a11.pickle | Bin 4874 -> 8021 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/whipper/test/cache/result/fe105a11.pickle b/whipper/test/cache/result/fe105a11.pickle index 9ae322d9319d3d3956a8869b2b6baabd089153ab..e2a3a0589084066cc0d5752638c8067e25329f23 100644 GIT binary patch literal 8021 zcmbuEQFGfi635^9DL8$RZ>Dtt5F~-eIB9dfNz#txOM6cqT7qR>WsxURN!(9=|6Py@ zDAN{4eu*QB1oyYQSp0W&R(`!N>)LJ4x31Z(+wM))L|FJD`+X}Z;o4BP5#d?jK4d1*i7JoIk+eT;WT8ilG8B?$6#=Ws@tt4|>7_rzc zu!2mYOPd&zCwY?6+W*@X>#}{MuXOaQq)VIK!>uDYnMRj<<*r=2P4Pem%Pjib`RV5a zw)m&`S(KlJJddB=f4OP5RebjBWB)k6TNewwH7CPrSNugLnCMq=ZjDLP)C!|SA{DdL zTem7|y2D17f}U7Z^`i$@VgP8kr_Z)T}yht;k1;KA-9rHRhLj z6~C{lWk;|0h2zw#j&((Vfq_#2HK%my0kz7KROuX0Lqay-RKjG8@St zvU(=Q1KQBqskk}g8jqU@on*#fj}5|!O?-Md^%(5iYIEnBrmQwie0JxG_B{SrHqB%F z%X(c_ZQG~0vft4YrBY$@EX^pn2jJiBo`{{GWGw4MdTf~+A&tm1gZf?1dCc!QHOlE2 z_{DA&7x6_^b+Ju&t4zq`(8j5d2}5cRsg$r<<|0P{8$_40>r}{W4D#AN)NRosx;-U3 zasp*&{I0xi+v! z+05im(l#)5DlJaDWvxX=Yg1utrjgFWn6d$<#?*|_{&DZNZnlj7Q|*A-fok@051LAo zNRjF>(!kJ(q*^g)(r;0#jkUSoFTob&0&yy-9V7jxdyGF6%hEMHC6|Ss^7(K|Bwlah zRLGPevkuaxh^Nv(ABGbO=k)BAVvO?gjzjsu6<=ImfnsteVnZH3_6}s#8e7gFJqXY?7n0 z3B@;lTWn@+{Gmc7qdfJnp=x>oRtLsTrDf5ScA`lpHkVonuS&w0zD766QQb6ei^rZX zkVfVOzRN~wtW!rxZmpGRdMJ*(CO&n0j;f>iSLbk^mfu?EdhL*f3h4#Tz|5(b ztdFuz9{~`lAaYL8Fp96yM{-mj{kG#K@6AK;H(K2IJ(^T^eoj?-SuTp!E#tO|-)xp! z*S1A`jmF@i*z}S(3$;|9*i31m5}iCz7Xi>zhp?2&Iw>V(21T43Uxq`EyhcmOQ7!cz zVek6Qo zcwS*-^!eZO`A2E3fY?ef5y1w*jAgehE4a+++6+j2?w;zmBTjfE{+w}!m`LgNpME}JI{b>JbE=MgfFQByEHVk-)jdD?@Y-A#_R*v^NJ3RBwGMNep53k)SctksTv3 zf}&SpXf}Z0CWaumlm`%5swYAy?v5n#@(>~egkr~sm4G*hj|A(KE)pu60KsZUD#)EM zoha`)5_~=e5JqZ}1`{HIT1f6e_j(9{A}KMQIfw*@#zU|RI|z&)k47Tt9z*#UKu|y_ z60|g|#ya>+``Vg`8$0p4Ex~R(NGC%OoH1b}_(Eq5C36RXmi{ON+HLX|+QR_^ci{v< zONS811B-$=B^0Qlyfn7k0fhzycE&*{*m6&yIk&tQ&@~>X@I^$Uh=ifw;Tut~t_?yV zwU+SC6bh6fqCm@aK!MH#m-$c#W8o{7$G}m#4+gaEQ4B1}??M?FU{EFzhVR)!jx0$g z=2Ysp9CaAOXuvRVu=58Tyj460#QUBDXUkCz=xgH0P)R}#Zi$(L)*fV)LBlhx)IwYH z+D{Jcl&Vz5i8J8f2z3wfZue;gC3u{}7nA(pq~TEx=tX|l!RZZ;b$RvV_*OE7e4E7Kw;ojGAqR;N5&^@b z52x>*1Btljz#(;%0}de$cwv}Vl)M~|!xJ1b#L^a>5D#crUi;}0o)ZUW&LFS2e))Lt zuNz&_g_u3cflWd0A{7|!4{l4DgVrA8Rfa*}w5p5edF>~sIQ)QDJ~_pCpwi_Py`n!n zpns2Z_?iL@JmjEdnB(vqS4QMi1t!G9t7b*2dAJWa66|;Ew!OWWl^nGfKVp(^6vXe) z-u}d9p*HZlRhjDd0h$c7Uo`tdPokij=QHl%V(|^#@`Zh81%JUMs521HQe)J##b)6? zyDj}Z#W$h)ATP0^E0)!cS}9B`p`$Tc!6^U-&1VnQ(yi$Wl>Pba-RE~#aUB2t=TAn8 P`5XEnT#*32J&*nmsRrzb literal 4874 zcmbu?*>@XP9l&v~k}dB^Q&K|91Oiq{tc;|Q#Rr(v@c#X+}TI zD7Ff>O@XFq*=d24y=_`rC@C%b9w=*oQnn}l0eIlR6E8i7^1GTlcqC0;)Vw%HvOoIX z-)vWByTZ9mO)r;8B~l?)wP^Dnp%uNnQhy-?9VT>A=n5-=GsMW773fy_jxEittsY$w zphpR)6!ikEG?{DDyrXkqu1+`d& zJ|$pR)ZA$c`qv>8zFN^L`yIDwz=S~xLt!Oo<7eh7IT&7iVCR2QN)W1QQMYR_GC%e2 zj`}|(U{p(4Qi0KQr_xu@i^Nb%1jg0?-!7ThRITU-o7#m5;i|<4#b`um{rv^Qu9!mj zs(-dWQYfl9*rD{4iFz7#&QJa8@mpA-5-3;5hFXSe(j7`LXO?ShLA&Y;s%FC)F7{dq zuM2C#i`PGYVM5zpnl_s5(#FKmW?kg$_PrmdA_VNI_u5 z7YlptYAo)>;*)I;H{n-2UEL5=VcImEk?w67X+49Ny@|q`+0l>1L|KZa#8kBD=m#+H zwzdP4eu1l`RJK(cN9q*rYbo^R@X)tVcq}MZ=-O4ouSvf`byIo+W(qP0NJndFsTVkYF;OnQ#jEw&Uyz= zi%>Yo(yoZ-?Z%5IglT%a1B{A(X$yt=?3RdnhPc=J5whi8=3>h%>sh=sN+HHdI~Sgt zYAhYV(mUHO^?gru)rr1aG)`85Cd;-JJA0bq}GJx zns5Z4)J|Kn^)Ry#-j<>;iERs#C`qw|l!zvqE|(!p%(k8A`y9gST9{Fdaa&k2@p$7^ zh$56&rYfjruEp7Dz9`#NNH?yd&p6zk5lUFZ9lIa;l6 z<_?wAyK%=V%;V;hL?Y~>&+9qWCV9a&g+oTZLTpPg%7!xI^2)_TW{+#%~Pk>CXB`^{H9QELLp-r_vqOti=u`2EUuaonfsxRf>bE z)f>AsY|Cnxl*1$qKQ~W-gf;v$?GA0XwvM}ZT#0sS`EUES)dGc$W>riiqo6rzH&b<{ z-o@3^6pF682i0z_KD)lHmM9p_DvnhI(@}evT4pM6wL-yi)f-Ul;p(NQw^f@$wN;f8 zaK=%4nYzi;Ew0um-0iA+QSIgGl~=db_fUARkD3JPr~#(l!_<4ZdX~a{uDTD^fTJ!3 zZ|?LQulG@SzmF@!2OKxZ-20h(j=K*~IPbdS=mxp_%KcvVK?)D~xRdZf$L(Y8hnV|e z?tX;AM_uc$a4mpQdo3 z)lDSeQO6B2_cP4>EO$Rg;q$I5q8oDOdym)s0);R7xDtHHaR-?D7;_)z?h_O)x^5iZ z0q$OW$?HBz;VBHLFPWq+-JD^6$)Q<-6Xn$+}*XK+cSq}DSXY>z2vw<%zciz zU+3=g6kc#$8Qmf7KCF7(Z&3KAj~j(=IqooXzs=n5aQC|uzUR6(p*zgoW6yZq?^F0e zt1G48hmJeK+#fOb$K3r1h0Crxh3*J2%>6lYf5F{fQuvkY zPNO@@-AjjiJoEiEh2Ml7VvG@281Y+9{Eou!U1AQ2F;48<zgg+~z Zv&Uyw1VK2qHZd6$GlvBDOEnt_{STA{_v8Qo