diff --git a/dist/dist.py b/dist/dist.py index 54b27f6153..bb33b8e52f 100644 --- a/dist/dist.py +++ b/dist/dist.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: dist.py # Purpose: Distribution and uploading script diff --git a/documentation/docbuild/__init__.py b/documentation/docbuild/__init__.py index 9c41f0490a..50b65214a5 100644 --- a/documentation/docbuild/__init__.py +++ b/documentation/docbuild/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- __all__ = ['documenters', 'iterators', 'writers'] from . import documenters diff --git a/documentation/docbuild/documenters.py b/documentation/docbuild/documenters.py index 6ab577ed8e..4baf0400bc 100644 --- a/documentation/docbuild/documenters.py +++ b/documentation/docbuild/documenters.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: documentation/library/documenters.py # Purpose: music21 documentation helper classes for proper formatting diff --git a/documentation/docbuild/extensions.py b/documentation/docbuild/extensions.py index 3b38fc5e55..a488918479 100644 --- a/documentation/docbuild/extensions.py +++ b/documentation/docbuild/extensions.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: extensions.py # Purpose: Sphinx extension for hiding and showing lines in docs diff --git a/documentation/docbuild/iterators.py b/documentation/docbuild/iterators.py index 9768155ccc..d5001a9ed0 100644 --- a/documentation/docbuild/iterators.py +++ b/documentation/docbuild/iterators.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: docbuild/iterators.py # Purpose: music21 documentation iterators, including Jupyter notebook to ReST converter diff --git a/documentation/docbuild/make.py b/documentation/docbuild/make.py index 28497d56bd..0a34e9241d 100644 --- a/documentation/docbuild/make.py +++ b/documentation/docbuild/make.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: documentation/make.py # Purpose: music21 documentation script, v. 2.0 diff --git a/documentation/docbuild/upload.py b/documentation/docbuild/upload.py index 1fc6457f61..12b2710255 100644 --- a/documentation/docbuild/upload.py +++ b/documentation/docbuild/upload.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: upload.py # Purpose: music21 documentation upload utility diff --git a/documentation/docbuild/writers.py b/documentation/docbuild/writers.py index c4a8eef574..b967f3e943 100644 --- a/documentation/docbuild/writers.py +++ b/documentation/docbuild/writers.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: docbuild/writers.py # Purpose: music21 documentation writer to rst @@ -361,11 +360,11 @@ def convertOneNotebook(self, jupyterNotebookFilePath): self.runNBConvert(jupyterNotebookFilePath) # uses this convoluted way of reading because 'encoding' was an invalid keyword argument # for the built-in 'open' in old python, and never upgraded. - with rstFilePath.open('r', encoding='utf8') as f: + with rstFilePath.open('r', encoding='utf-8') as f: oldLines = f.read().splitlines() lines = self.cleanConvertedNotebook(oldLines, jupyterNotebookFilePath) - with rstFilePath.open('w', encoding='utf8') as f: + with rstFilePath.open('w', encoding='utf-8') as f: f.write('\n'.join(lines)) return True diff --git a/documentation/nbvalNotebook.py b/documentation/nbvalNotebook.py index 078de643a9..b34317ae06 100644 --- a/documentation/nbvalNotebook.py +++ b/documentation/nbvalNotebook.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ''' Run tests of notebooks using nbval -- called from testDocumentation diff --git a/documentation/source/conf.py b/documentation/source/conf.py index 470107273a..12b56a78b4 100644 --- a/documentation/source/conf.py +++ b/documentation/source/conf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # music21 documentation build configuration file, created by # sphinx-quickstart on Fri Jun 14 16:48:40 2013. diff --git a/documentation/testDocumentation.py b/documentation/testDocumentation.py index f32adc7275..2789d22840 100644 --- a/documentation/testDocumentation.py +++ b/documentation/testDocumentation.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: testDocumentation.py # Purpose: tests from or derived from the Documentation diff --git a/music21/__init__.py b/music21/__init__.py index 3133d5bf2b..351446b07c 100644 --- a/music21/__init__.py +++ b/music21/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ''' The music21 Framework is Copyright © 2006-2026 Michael Scott Asato Cuthbert. diff --git a/music21/_version.py b/music21/_version.py index 72dbfdf646..3f1c7aab38 100644 --- a/music21/_version.py +++ b/music21/_version.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- + ''' This file contains Music21's version number information. diff --git a/music21/abcFormat/__init__.py b/music21/abcFormat/__init__.py index 0484f17e98..8dd819b911 100644 --- a/music21/abcFormat/__init__.py +++ b/music21/abcFormat/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: abc/__init__.py # Purpose: parses ABC Notation diff --git a/music21/abcFormat/testFiles.py b/music21/abcFormat/testFiles.py index 2dc1d864cb..8cbd76cad9 100644 --- a/music21/abcFormat/testFiles.py +++ b/music21/abcFormat/testFiles.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: testFiles.py # Purpose: ABC test files diff --git a/music21/abcFormat/translate.py b/music21/abcFormat/translate.py index 091309f087..3caff8ab65 100644 --- a/music21/abcFormat/translate.py +++ b/music21/abcFormat/translate.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: abcFormat.translate.py # Purpose: Translate ABC and music21 objects diff --git a/music21/alpha/__init__.py b/music21/alpha/__init__.py index 719fd1493a..47fd99cbc7 100644 --- a/music21/alpha/__init__.py +++ b/music21/alpha/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: alpha/__init__.py # Purpose: music21 modules not fully ready for prime-time diff --git a/music21/alpha/analysis/__init__.py b/music21/alpha/analysis/__init__.py index 8217971ffc..1a03bb1c2a 100644 --- a/music21/alpha/analysis/__init__.py +++ b/music21/alpha/analysis/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import annotations __all__ = [ diff --git a/music21/alpha/analysis/aligner.py b/music21/alpha/analysis/aligner.py index 7a876b6113..321334531f 100644 --- a/music21/alpha/analysis/aligner.py +++ b/music21/alpha/analysis/aligner.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: alpha/analysis/aligner.py # Purpose: A general aligner that tries its best to align two streams diff --git a/music21/alpha/analysis/fixer.py b/music21/alpha/analysis/fixer.py index d13e7663a9..521b5be953 100644 --- a/music21/alpha/analysis/fixer.py +++ b/music21/alpha/analysis/fixer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: alpha/analysis/fixer.py # Purpose: Fixes two streams given a list of changes between them diff --git a/music21/alpha/analysis/hasher.py b/music21/alpha/analysis/hasher.py index 0c7c9d2e3b..1d3a5892fa 100644 --- a/music21/alpha/analysis/hasher.py +++ b/music21/alpha/analysis/hasher.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: alpha/analysis/hasher.py # Purpose: Hash musical notation diff --git a/music21/alpha/analysis/ornamentRecognizer.py b/music21/alpha/analysis/ornamentRecognizer.py index 51a5e215a3..ac4e0762f9 100644 --- a/music21/alpha/analysis/ornamentRecognizer.py +++ b/music21/alpha/analysis/ornamentRecognizer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: alpha/analysis/ornamentRecognizer.py # Purpose: Identifies expanded ornaments diff --git a/music21/alpha/analysis/search.py b/music21/alpha/analysis/search.py index 4e0c64d163..209ea469be 100644 --- a/music21/alpha/analysis/search.py +++ b/music21/alpha/analysis/search.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: search.py # Purpose: Tools for searching analysis diff --git a/music21/alpha/analysis/testFiles.py b/music21/alpha/analysis/testFiles.py index 4e0c335bf4..da8001b05d 100644 --- a/music21/alpha/analysis/testFiles.py +++ b/music21/alpha/analysis/testFiles.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: alpha/analysis/testFiles.py # Purpose: consolidated testFiles diff --git a/music21/analysis/__init__.py b/music21/analysis/__init__.py index 08980989a9..defd846ae1 100644 --- a/music21/analysis/__init__.py +++ b/music21/analysis/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import annotations __all__ = [ diff --git a/music21/analysis/correlate.py b/music21/analysis/correlate.py index 480152e89e..f43702b2f2 100644 --- a/music21/analysis/correlate.py +++ b/music21/analysis/correlate.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: correlate.py # Purpose: Stream analyzer designed to correlate and graph two properties diff --git a/music21/analysis/discrete.py b/music21/analysis/discrete.py index 9ede12fda6..149edaca2a 100644 --- a/music21/analysis/discrete.py +++ b/music21/analysis/discrete.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: discrete.py # Purpose: Framework for modular, windowed analysis diff --git a/music21/analysis/elements.py b/music21/analysis/elements.py index 4de4451366..ca9a231731 100644 --- a/music21/analysis/elements.py +++ b/music21/analysis/elements.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: analysis/elements.py # Purpose: Tools for analyzing general elements diff --git a/music21/analysis/enharmonics.py b/music21/analysis/enharmonics.py index 875a8e31cd..8cb66bf098 100644 --- a/music21/analysis/enharmonics.py +++ b/music21/analysis/enharmonics.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: enharmonics.py # Purpose: Tools for returning best enharmonics diff --git a/music21/analysis/floatingKey.py b/music21/analysis/floatingKey.py index 3b221df00a..2569167ca1 100644 --- a/music21/analysis/floatingKey.py +++ b/music21/analysis/floatingKey.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: analysis/floatingKey.py # Purpose: Framework for floating key analysis diff --git a/music21/analysis/harmonicFunction.py b/music21/analysis/harmonicFunction.py index 4037267bc1..cee140a835 100644 --- a/music21/analysis/harmonicFunction.py +++ b/music21/analysis/harmonicFunction.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: harmonicFunction.py # Purpose: Mapping between Roman numeral figures and harmonic function labels diff --git a/music21/analysis/metrical.py b/music21/analysis/metrical.py index 4d015de032..e51023c682 100644 --- a/music21/analysis/metrical.py +++ b/music21/analysis/metrical.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: metrical.py # Purpose: Tools for metrical analysis diff --git a/music21/analysis/neoRiemannian.py b/music21/analysis/neoRiemannian.py index 504de5a096..e16bb731c5 100644 --- a/music21/analysis/neoRiemannian.py +++ b/music21/analysis/neoRiemannian.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: analysis/neoRiemannian.py # Purpose: Neo-Riemannian Chord Transformations diff --git a/music21/analysis/patel.py b/music21/analysis/patel.py index bd400b8a65..58d690e869 100644 --- a/music21/analysis/patel.py +++ b/music21/analysis/patel.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: patel.py # Purpose: Tools for testing Aniruddh D. Patel's analysis theories diff --git a/music21/analysis/pitchAnalysis.py b/music21/analysis/pitchAnalysis.py index fce20998e5..4adc9d4518 100644 --- a/music21/analysis/pitchAnalysis.py +++ b/music21/analysis/pitchAnalysis.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: analysis/pitchAnalysis.py # Purpose: Tools for analyzing pitches diff --git a/music21/analysis/reduceChords.py b/music21/analysis/reduceChords.py index c4d8992865..ec0d477949 100644 --- a/music21/analysis/reduceChords.py +++ b/music21/analysis/reduceChords.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: reduceChords.py # Purpose: Tools for eliminating passing chords, etc. diff --git a/music21/analysis/reduceChordsOld.py b/music21/analysis/reduceChordsOld.py index 75741e72ff..16e1d7e9e8 100644 --- a/music21/analysis/reduceChordsOld.py +++ b/music21/analysis/reduceChordsOld.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: reduceChords.py # Purpose: Tools for eliminating passing chords, etc. diff --git a/music21/analysis/reduction.py b/music21/analysis/reduction.py index 5847a74677..7698032eab 100644 --- a/music21/analysis/reduction.py +++ b/music21/analysis/reduction.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: reduction.py # Purpose: Tools for creating a score reduction. diff --git a/music21/analysis/segmentByRests.py b/music21/analysis/segmentByRests.py index 1e42f4a6b4..4241f6f149 100644 --- a/music21/analysis/segmentByRests.py +++ b/music21/analysis/segmentByRests.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: segmentByRests.py # Purpose: Break up a part into its contiguous melodies. diff --git a/music21/analysis/transposition.py b/music21/analysis/transposition.py index edcd46ff27..05a5e538c7 100644 --- a/music21/analysis/transposition.py +++ b/music21/analysis/transposition.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: transposition.py # Purpose: Tools for checking distinct transposition diff --git a/music21/analysis/windowed.py b/music21/analysis/windowed.py index fd530657a7..a0c200ddb0 100644 --- a/music21/analysis/windowed.py +++ b/music21/analysis/windowed.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: windowed.py # Purpose: Framework for modular, windowed analysis diff --git a/music21/articulations.py b/music21/articulations.py index cf337e77cf..ea7020b045 100644 --- a/music21/articulations.py +++ b/music21/articulations.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: articulations.py # Purpose: music21 classes for representing articulations diff --git a/music21/audioSearch/__init__.py b/music21/audioSearch/__init__.py index 171c1ea177..f056fd391b 100644 --- a/music21/audioSearch/__init__.py +++ b/music21/audioSearch/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: audioSearch.py # Purpose: base subroutines for all audioSearching and score following diff --git a/music21/audioSearch/recording.py b/music21/audioSearch/recording.py index f1860b8763..64802018b2 100644 --- a/music21/audioSearch/recording.py +++ b/music21/audioSearch/recording.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: audioSearch.recording.py # Purpose: routines for making recordings from microphone input diff --git a/music21/audioSearch/scoreFollower.py b/music21/audioSearch/scoreFollower.py index d44e2a03a0..e705c35f91 100644 --- a/music21/audioSearch/scoreFollower.py +++ b/music21/audioSearch/scoreFollower.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: audioSearch.scoreFollower.py # Purpose: Detection of the position in the score in real time diff --git a/music21/audioSearch/transcriber.py b/music21/audioSearch/transcriber.py index 08cba0e402..1f00e13f7e 100644 --- a/music21/audioSearch/transcriber.py +++ b/music21/audioSearch/transcriber.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: audioSearch.transcriber.py # Purpose: Automatically transcribe melodies from a microphone or diff --git a/music21/bar.py b/music21/bar.py index be5dfe059f..ba7c14b43c 100644 --- a/music21/bar.py +++ b/music21/bar.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: bar.py # Purpose: music21 classes for representing bars, repeats, and related diff --git a/music21/base.py b/music21/base.py index a34b48082e..5a1acb8019 100644 --- a/music21/base.py +++ b/music21/base.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: base.py # Purpose: Music21 base classes and important utilities diff --git a/music21/beam.py b/music21/beam.py index 8240d1a957..21b659c3e3 100644 --- a/music21/beam.py +++ b/music21/beam.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: beam.py # Purpose: music21 classes for representing beams and beam groups diff --git a/music21/braille/__init__.py b/music21/braille/__init__.py index 56cfefe3ae..d861b8fb5f 100644 --- a/music21/braille/__init__.py +++ b/music21/braille/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import annotations __all__ = [ diff --git a/music21/braille/basic.py b/music21/braille/basic.py index 0ff219b696..aae0121d71 100644 --- a/music21/braille/basic.py +++ b/music21/braille/basic.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: basic.py # Purpose: music21 class which allows transcription of music21Object instances to braille. diff --git a/music21/braille/examples.py b/music21/braille/examples.py index f212cab100..815e0f3cbb 100644 --- a/music21/braille/examples.py +++ b/music21/braille/examples.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: examples.py # Purpose: Transcribing popular music into braille music using music21. diff --git a/music21/braille/lookup.py b/music21/braille/lookup.py index b887c3bb6b..66f8c5e38b 100644 --- a/music21/braille/lookup.py +++ b/music21/braille/lookup.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ---------------------------------------------------------------------------------- # Name: lookup.py # Purpose: music21 class which contains lookup tables between print and braille diff --git a/music21/braille/noteGrouping.py b/music21/braille/noteGrouping.py index 491f08a327..588a0d255f 100644 --- a/music21/braille/noteGrouping.py +++ b/music21/braille/noteGrouping.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: noteGrouping.py # Purpose: Transcribes note groupings into Braille diff --git a/music21/braille/objects.py b/music21/braille/objects.py index c412bd2d8f..2c3d464621 100644 --- a/music21/braille/objects.py +++ b/music21/braille/objects.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: object.py # Purpose: music21 classes for indicating Braille formatting, etc. diff --git a/music21/braille/runAllBrailleTests.py b/music21/braille/runAllBrailleTests.py index e0237d9813..906ba6e09d 100644 --- a/music21/braille/runAllBrailleTests.py +++ b/music21/braille/runAllBrailleTests.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: braille/runAllBrailleTests.py # Purpose: Test runner for Bo-Cheng Jhan and others who would prefer diff --git a/music21/braille/segment.py b/music21/braille/segment.py index 24d0c16566..f934f3d7c9 100644 --- a/music21/braille/segment.py +++ b/music21/braille/segment.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: segment.py # Purpose: Division of stream.Part into segments for individual handling diff --git a/music21/braille/test.py b/music21/braille/test.py index f614185232..a977586d6e 100644 --- a/music21/braille/test.py +++ b/music21/braille/test.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: test.py # Purpose: Examples from "Introduction to Braille Music Transcription" diff --git a/music21/braille/text.py b/music21/braille/text.py index d5720b2b73..6335f59499 100644 --- a/music21/braille/text.py +++ b/music21/braille/text.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: text.py # Purpose: music21 class which allows for accurate formatting of braille transcription diff --git a/music21/braille/translate.py b/music21/braille/translate.py index 34aa8bb45d..655389d535 100644 --- a/music21/braille/translate.py +++ b/music21/braille/translate.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: translate.py # Purpose: music21 class which allows transcription of music21 data to braille diff --git a/music21/capella/__init__.py b/music21/capella/__init__.py index 8c74bf5343..7c511d7f3d 100644 --- a/music21/capella/__init__.py +++ b/music21/capella/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: capella/__init__.py # Purpose: parses Capella music Notation diff --git a/music21/capella/fromCapellaXML.py b/music21/capella/fromCapellaXML.py index 75bed08b6d..d0f502f77c 100644 --- a/music21/capella/fromCapellaXML.py +++ b/music21/capella/fromCapellaXML.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: fromCapellaXML.py # Purpose: Module for importing capellaXML (.capx) files. diff --git a/music21/chord/__init__.py b/music21/chord/__init__.py index 0bc7df3267..376bc9225d 100644 --- a/music21/chord/__init__.py +++ b/music21/chord/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: chord.py # Purpose: Chord representation and utilities diff --git a/music21/chord/tables.py b/music21/chord/tables.py index c15babb279..0dfcee549d 100644 --- a/music21/chord/tables.py +++ b/music21/chord/tables.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: chord.tables.py # Purpose: data and tables for chord and set class processing. diff --git a/music21/chord/tools.py b/music21/chord/tools.py index 9e80e0eaf7..4b8458d9a0 100644 --- a/music21/chord/tools.py +++ b/music21/chord/tools.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: chord/tools.py # Purpose: Chord utilities too obscure to go on the Chord object diff --git a/music21/clef.py b/music21/clef.py index b0b4fcd297..01c442c3c6 100644 --- a/music21/clef.py +++ b/music21/clef.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: clef.py # Purpose: Objects for representing clefs diff --git a/music21/common/__init__.py b/music21/common/__init__.py index 2c5f6c7883..bea3d4a4c7 100644 --- a/music21/common/__init__.py +++ b/music21/common/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common.py # Purpose: Basic Utilities diff --git a/music21/common/classTools.py b/music21/common/classTools.py index 77a25bb342..bdd3914c10 100644 --- a/music21/common/classTools.py +++ b/music21/common/classTools.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/classTools.py # Purpose: Utilities for classes diff --git a/music21/common/decorators.py b/music21/common/decorators.py index 73f9b7a381..d10cd5eeff 100644 --- a/music21/common/decorators.py +++ b/music21/common/decorators.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/decorators.py # Purpose: Decorators for functions diff --git a/music21/common/enums.py b/music21/common/enums.py index 640c40825c..634ba646c1 100644 --- a/music21/common/enums.py +++ b/music21/common/enums.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/enums.py # Purpose: Music21 Enumerations diff --git a/music21/common/fileTools.py b/music21/common/fileTools.py index 55b07452d3..8fabcb5ef9 100644 --- a/music21/common/fileTools.py +++ b/music21/common/fileTools.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/fileTools.py # Purpose: Utilities for files @@ -79,37 +78,39 @@ def readFileEncodingSafe(filePath, firstGuess='utf-8') -> str: # noinspection PyShadowingNames r''' Slow, but will read a file of unknown encoding as safely as possible using - the chardet package. + the chardet package. Mostly obsolete in the utf-8 world of today, but + useful for older code - Let's try to load this file as ascii -- it has a copyright symbol at the top, - so it won't load in Python3: + Let's try to load the `music21.common.__init__.py` file as ascii -- + it has a copyright symbol near the top, so it won't load in Python3: >>> import os >>> c = str(common.getSourceFilePath() / 'common' / '__init__.py') - >>> #_DOCS_SHOW f = open(c) - >>> #_DOCS_SHOW data = f.read() + >>> f = open(c, encoding='ascii') + >>> data = f.read() Traceback (most recent call last): UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position ...: ordinal not in range(128) - That won't do! now I know that it is in utf-8, but maybe you don't. Or it could - be an old humdrum or Noteworthy file with unknown encoding. This will load it safely. + That won't do! Now I know that it is in utf-8, but maybe you don't. Or it could + be an old Humdrum or Noteworthy file with Windows or unknown encoding. + This will load it as safely as possible. >>> data = common.readFileEncodingSafe(c) - >>> data[0:30] - '# -*- coding: utf-8 -*-\n# ----' + >>> data[83:106] + 'Name: common.py' Well, that's nothing, since the first guess here is utf-8, and it's right. So let's give a worse first guess: >>> data = common.readFileEncodingSafe(c, firstGuess='SHIFT_JIS') # old Japanese standard - >>> data[0:30] - '# -*- coding: utf-8 -*-\n# ----' + >>> data[83:106] + 'Name: common.py' It worked! - Note that this is slow enough if it gets it wrong that the firstGuess should be set - to something reasonable like 'ascii' or 'utf-8'. + Note that trying lots of encodings is slow enough when the first guess is wrong + that the firstGuess should be set to something reasonable like 'utf-8' or 'ascii'. ''' try: with io.open(filePath, 'r', encoding=firstGuess) as thisFile: diff --git a/music21/common/formats.py b/music21/common/formats.py index 8f8dbda1b0..230b67dfbe 100644 --- a/music21/common/formats.py +++ b/music21/common/formats.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/formats.py # Purpose: Utilities for formats diff --git a/music21/common/misc.py b/music21/common/misc.py index 11ee483073..88c93dd08e 100644 --- a/music21/common/misc.py +++ b/music21/common/misc.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/misc.py # Purpose: Everything that doesn't fit into anything else. diff --git a/music21/common/numberTools.py b/music21/common/numberTools.py index 62be3cfe15..0e24263c0c 100644 --- a/music21/common/numberTools.py +++ b/music21/common/numberTools.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/numberTools.py # Purpose: Utilities for working with numbers or number-like objects diff --git a/music21/common/objects.py b/music21/common/objects.py index 3530e029f0..bd169fa697 100644 --- a/music21/common/objects.py +++ b/music21/common/objects.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/objects.py # Purpose: Commonly used Objects and Mixins diff --git a/music21/common/parallel.py b/music21/common/parallel.py index 370b86a227..f6942a2471 100644 --- a/music21/common/parallel.py +++ b/music21/common/parallel.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/parallel.py # Purpose: Utilities for parallel computing diff --git a/music21/common/pathTools.py b/music21/common/pathTools.py index 13819ccb99..610926d684 100644 --- a/music21/common/pathTools.py +++ b/music21/common/pathTools.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/pathTools.py # Purpose: Utilities for paths diff --git a/music21/common/stringTools.py b/music21/common/stringTools.py index b740a4a695..44da9ac031 100644 --- a/music21/common/stringTools.py +++ b/music21/common/stringTools.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/stringTools.py # Purpose: Utilities for strings diff --git a/music21/common/types.py b/music21/common/types.py index 1dfc0aeeba..2ee41f4bd8 100644 --- a/music21/common/types.py +++ b/music21/common/types.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/types.py # Purpose: Music21 Typing aids diff --git a/music21/common/weakrefTools.py b/music21/common/weakrefTools.py index 5a4971bd60..d1a1daa49c 100644 --- a/music21/common/weakrefTools.py +++ b/music21/common/weakrefTools.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: common/weakrefTools.py # Purpose: Utilities for weak references diff --git a/music21/configure.py b/music21/configure.py index 7f32011925..8045d81505 100644 --- a/music21/configure.py +++ b/music21/configure.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: configure.py # Purpose: Installation and Configuration Utilities diff --git a/music21/converter/__init__.py b/music21/converter/__init__.py index 96db70d145..2ba1837c26 100644 --- a/music21/converter/__init__.py +++ b/music21/converter/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: converter/__init__.py # Purpose: Provide a common way to create Streams from any data music21 diff --git a/music21/converter/museScore.py b/music21/converter/museScore.py index 6f8696d9b1..679e235374 100644 --- a/music21/converter/museScore.py +++ b/music21/converter/museScore.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: converter/museScore.py # Purpose: music21 to MuseScore connection diff --git a/music21/converter/qmConverter.py b/music21/converter/qmConverter.py index 08d91f81da..a2d76be392 100644 --- a/music21/converter/qmConverter.py +++ b/music21/converter/qmConverter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: converter/qmConverter.py # Purpose: Example of subclassing SubConverter to parse a new format diff --git a/music21/converter/subConverters.py b/music21/converter/subConverters.py index e2f33f37ec..36aadad7a9 100644 --- a/music21/converter/subConverters.py +++ b/music21/converter/subConverters.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: converter/__init__.py # Purpose: Specific subConverters for formats music21 should handle diff --git a/music21/corpus/__init__.py b/music21/corpus/__init__.py index 192ca3becf..500a62ab8e 100644 --- a/music21/corpus/__init__.py +++ b/music21/corpus/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: corpus/__init__.py # Purpose: Shortcuts to the corpus collection diff --git a/music21/corpus/chorales.py b/music21/corpus/chorales.py index 044a445e36..09b636e610 100644 --- a/music21/corpus/chorales.py +++ b/music21/corpus/chorales.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: corpus/chorales.py # Purpose: Access to the chorale collection diff --git a/music21/corpus/corpora.py b/music21/corpus/corpora.py index 2d84ab9ab2..2e2b23c7e5 100644 --- a/music21/corpus/corpora.py +++ b/music21/corpus/corpora.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: corpora.py # Purpose: corpus classes diff --git a/music21/corpus/manager.py b/music21/corpus/manager.py index 666a7d8e04..1114b9cf96 100644 --- a/music21/corpus/manager.py +++ b/music21/corpus/manager.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: corpus/manager.py # Purpose: Manage multiple corpora diff --git a/music21/corpus/testCorpus.py b/music21/corpus/testCorpus.py index 0619b41360..04993128b5 100644 --- a/music21/corpus/testCorpus.py +++ b/music21/corpus/testCorpus.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: corpus/testCorpus.py # Purpose: testing for the corpus diff --git a/music21/corpus/virtual.py b/music21/corpus/virtual.py index 314dcd45c3..599448bd45 100644 --- a/music21/corpus/virtual.py +++ b/music21/corpus/virtual.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: corpus/virtual.py # Purpose: Access to the Virtual corpus collection diff --git a/music21/corpus/work.py b/music21/corpus/work.py index 17e449ff60..6b1aaf0cb1 100644 --- a/music21/corpus/work.py +++ b/music21/corpus/work.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: corpus/work.py # Purpose: Manage one work diff --git a/music21/defaults.py b/music21/defaults.py index 39f74e7f99..27019010ba 100644 --- a/music21/defaults.py +++ b/music21/defaults.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: defaults.py # Purpose: Storage for user environment settings and defaults diff --git a/music21/derivation.py b/music21/derivation.py index 633ac941d8..c2db9ce8b5 100644 --- a/music21/derivation.py +++ b/music21/derivation.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: derivation.py # Purpose: Class for storing and managing Stream-based derivations diff --git a/music21/duration.py b/music21/duration.py index 11be4bc945..0b5dcc6f04 100644 --- a/music21/duration.py +++ b/music21/duration.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: duration.py # Purpose: music21 classes for representing durations diff --git a/music21/dynamics.py b/music21/dynamics.py index bb7ba8f9af..764667f407 100644 --- a/music21/dynamics.py +++ b/music21/dynamics.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: dynamics.py # Purpose: Module for dealing with dynamics changes. diff --git a/music21/editorial.py b/music21/editorial.py index f2f1e1073e..50c1b99c95 100644 --- a/music21/editorial.py +++ b/music21/editorial.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: editorial.py # Purpose: music21 classes for representing editorial information diff --git a/music21/environment.py b/music21/environment.py index 5e219aa60b..e2ce9d0bb0 100644 --- a/music21/environment.py +++ b/music21/environment.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: environment.py # Purpose: Storage for user environment settings and defaults diff --git a/music21/exceptions21.py b/music21/exceptions21.py index 4ad6830808..cbb7494260 100644 --- a/music21/exceptions21.py +++ b/music21/exceptions21.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: exceptions21.py # Purpose: music21 Exceptions (called out to not require import music21 to access) diff --git a/music21/expressions.py b/music21/expressions.py index 2330a73e6d..08da2e730c 100644 --- a/music21/expressions.py +++ b/music21/expressions.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: expressions.py # Purpose: Expressions such as Fermatas, etc. diff --git a/music21/features/__init__.py b/music21/features/__init__.py index c43f50f796..d25230c5a7 100644 --- a/music21/features/__init__.py +++ b/music21/features/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: features/__init__.py # Purpose: Feature extractors diff --git a/music21/features/base.py b/music21/features/base.py index 7071c6b46b..61183da4dc 100644 --- a/music21/features/base.py +++ b/music21/features/base.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: features/base.py # Purpose: Feature extractors base classes. diff --git a/music21/features/jSymbolic.py b/music21/features/jSymbolic.py index c2f08d1c48..8bc5c07809 100644 --- a/music21/features/jSymbolic.py +++ b/music21/features/jSymbolic.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: features.jSymbolic.py # Purpose: music21 functions for simple feature extraction diff --git a/music21/features/native.py b/music21/features/native.py index 04954b6c4a..64af40134c 100644 --- a/music21/features/native.py +++ b/music21/features/native.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: features.native.py # Purpose: music21 feature extractors diff --git a/music21/features/outputFormats.py b/music21/features/outputFormats.py index f59be0e993..6b25f38046 100644 --- a/music21/features/outputFormats.py +++ b/music21/features/outputFormats.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import annotations from music21 import environment diff --git a/music21/figuredBass/__init__.py b/music21/figuredBass/__init__.py index d3bd02b97e..16ea0a558c 100644 --- a/music21/figuredBass/__init__.py +++ b/music21/figuredBass/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: figuredBass/__init__.py # Purpose: Figured Bass representation, manipulation, and analysis diff --git a/music21/figuredBass/checker.py b/music21/figuredBass/checker.py index 7f64e803f0..76d8159d5e 100644 --- a/music21/figuredBass/checker.py +++ b/music21/figuredBass/checker.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: checker.py # Purpose: checks figured basses for following voice-leading rules diff --git a/music21/figuredBass/examples.py b/music21/figuredBass/examples.py index a6846546de..ea338c5f36 100644 --- a/music21/figuredBass/examples.py +++ b/music21/figuredBass/examples.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: examples.py # Purpose: Figured bass test cases diff --git a/music21/figuredBass/notation.py b/music21/figuredBass/notation.py index f64a102374..fe8099ec31 100644 --- a/music21/figuredBass/notation.py +++ b/music21/figuredBass/notation.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: notation.py # Purpose: representations of figured bass notation diff --git a/music21/figuredBass/possibility.py b/music21/figuredBass/possibility.py index 47ee9ae665..e116bab33d 100644 --- a/music21/figuredBass/possibility.py +++ b/music21/figuredBass/possibility.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: possibility.py # Purpose: rule checking functions for a "possibility" represented as a tuple. diff --git a/music21/figuredBass/realizer.py b/music21/figuredBass/realizer.py index 160fb33333..853767ca16 100644 --- a/music21/figuredBass/realizer.py +++ b/music21/figuredBass/realizer.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: realizer.py # Purpose: figured bass lines, consisting of notes diff --git a/music21/figuredBass/realizerScale.py b/music21/figuredBass/realizerScale.py index 7a96eb7654..775e53233e 100644 --- a/music21/figuredBass/realizerScale.py +++ b/music21/figuredBass/realizerScale.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: realizerScale.py # Purpose: a figured bass scale diff --git a/music21/figuredBass/resolution.py b/music21/figuredBass/resolution.py index 9b05d08ff5..8dbf6da3a6 100644 --- a/music21/figuredBass/resolution.py +++ b/music21/figuredBass/resolution.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: resolution.py # Purpose: Defines standard resolutions for possibility instances diff --git a/music21/figuredBass/rules.py b/music21/figuredBass/rules.py index 5cef588409..89e7a080be 100644 --- a/music21/figuredBass/rules.py +++ b/music21/figuredBass/rules.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: rules.py # Purpose: Define rules used in realization diff --git a/music21/figuredBass/segment.py b/music21/figuredBass/segment.py index 6c30b7da31..c38ecb1b91 100644 --- a/music21/figuredBass/segment.py +++ b/music21/figuredBass/segment.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: segment.py # Purpose: figured bass note and notational realization. diff --git a/music21/freezeThaw.py b/music21/freezeThaw.py index 4c61990057..2726884b5c 100644 --- a/music21/freezeThaw.py +++ b/music21/freezeThaw.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: freezeThaw.py # Purpose: Methods for storing any music21 object on disk. diff --git a/music21/graph/__init__.py b/music21/graph/__init__.py index a7804d3e52..10bf90d459 100644 --- a/music21/graph/__init__.py +++ b/music21/graph/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: graph.py # Purpose: Classes for graphing in matplotlib and/or other graphing tools. diff --git a/music21/graph/axis.py b/music21/graph/axis.py index adcfd3cc14..329c16b269 100644 --- a/music21/graph/axis.py +++ b/music21/graph/axis.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: graph/axis.py # Purpose: Classes for extracting one dimensional data for graphs diff --git a/music21/graph/findPlot.py b/music21/graph/findPlot.py index bf31b67ced..63ec04d377 100644 --- a/music21/graph/findPlot.py +++ b/music21/graph/findPlot.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: graph/findPlot.py # Purpose: Functions that find appropriate plots for graph.plot diff --git a/music21/graph/plot.py b/music21/graph/plot.py index 4185f9ac97..f5fc07b0ed 100644 --- a/music21/graph/plot.py +++ b/music21/graph/plot.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: graph/plots.py # Purpose: Classes for plotting music21 graphs based on Streams. diff --git a/music21/graph/primitives.py b/music21/graph/primitives.py index bf37286827..8fec85c3f5 100644 --- a/music21/graph/primitives.py +++ b/music21/graph/primitives.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: graph/primitives.py # Purpose: Classes for graphing in matplotlib and/or other graphing tools. diff --git a/music21/graph/utilities.py b/music21/graph/utilities.py index 9a399d948d..41cd705b1a 100644 --- a/music21/graph/utilities.py +++ b/music21/graph/utilities.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: graph/utilities.py # Purpose: Functions for finding external modules, manipulating colors, etc. diff --git a/music21/harmony.py b/music21/harmony.py index ed55680f9c..840c6293e9 100644 --- a/music21/harmony.py +++ b/music21/harmony.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: harmony.py # Purpose: music21 classes for representing harmonies and chord symbols diff --git a/music21/humdrum/__init__.py b/music21/humdrum/__init__.py index 92926fc92e..9bd6a2dc39 100644 --- a/music21/humdrum/__init__.py +++ b/music21/humdrum/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: humdrum.__init__.py # Purpose: base module for emulating Humdrum functionality in music21 diff --git a/music21/humdrum/harmparser.py b/music21/humdrum/harmparser.py index 42b315364c..3609bfde8a 100644 --- a/music21/humdrum/harmparser.py +++ b/music21/humdrum/harmparser.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: humdrum.harmparser.py # Purpose: A parser for annotations in **harm spines of Humdrum diff --git a/music21/humdrum/instruments.py b/music21/humdrum/instruments.py index 059cc7fd48..6136f44850 100644 --- a/music21/humdrum/instruments.py +++ b/music21/humdrum/instruments.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: humdrum.instruments.py # Purpose: Instrument Lists for Humdrum and kern in particular diff --git a/music21/humdrum/questions.py b/music21/humdrum/questions.py index eea0921ece..7887c01756 100644 --- a/music21/humdrum/questions.py +++ b/music21/humdrum/questions.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import annotations import unittest diff --git a/music21/humdrum/spineParser.py b/music21/humdrum/spineParser.py index fa716dfc86..3aeef67906 100644 --- a/music21/humdrum/spineParser.py +++ b/music21/humdrum/spineParser.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: humdrum.spineParser.py # Purpose: Conversion and Utility functions for Humdrum and kern in particular diff --git a/music21/humdrum/testFiles.py b/music21/humdrum/testFiles.py index aea9062031..89416e06a8 100644 --- a/music21/humdrum/testFiles.py +++ b/music21/humdrum/testFiles.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import annotations # pylint: disable=line-too-long diff --git a/music21/instrument.py b/music21/instrument.py index 7da5467291..a4ffa68c89 100644 --- a/music21/instrument.py +++ b/music21/instrument.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: instrument.py # Purpose: Class for basic instrument information diff --git a/music21/interval.py b/music21/interval.py index c6d6e24592..5864145bb5 100644 --- a/music21/interval.py +++ b/music21/interval.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: interval.py # Purpose: music21 classes for representing intervals diff --git a/music21/ipython21/__init__.py b/music21/ipython21/__init__.py index 3a16c7ddf6..7e8e2e6560 100644 --- a/music21/ipython21/__init__.py +++ b/music21/ipython21/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: ipython21/__init__.py # Purpose: music21 Jupyter Notebook support diff --git a/music21/ipython21/converters.py b/music21/ipython21/converters.py index d6bf54174e..8eb33595de 100644 --- a/music21/ipython21/converters.py +++ b/music21/ipython21/converters.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: ipython21/converters.py # Purpose: music21 Jupyter Notebook external converters diff --git a/music21/ipython21/ipExtension.py b/music21/ipython21/ipExtension.py index 2f8d123f6f..be579821a5 100644 --- a/music21/ipython21/ipExtension.py +++ b/music21/ipython21/ipExtension.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import annotations from music21 import common diff --git a/music21/ipython21/objects.py b/music21/ipython21/objects.py index 0ddad16d50..84fb882615 100644 --- a/music21/ipython21/objects.py +++ b/music21/ipython21/objects.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ''' This module is no longer needed in v9 and just kept for historical reasons. ''' diff --git a/music21/key.py b/music21/key.py index 592bdac7ff..3fdbf229ee 100644 --- a/music21/key.py +++ b/music21/key.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: key.py # Purpose: Classes for keys diff --git a/music21/languageExcerpts/__init__.py b/music21/languageExcerpts/__init__.py index 9ed5ae3f49..633ce809b4 100644 --- a/music21/languageExcerpts/__init__.py +++ b/music21/languageExcerpts/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import annotations __all__ = [ diff --git a/music21/languageExcerpts/instrumentLookup.py b/music21/languageExcerpts/instrumentLookup.py index f83340447b..9cd3b3c97a 100644 --- a/music21/languageExcerpts/instrumentLookup.py +++ b/music21/languageExcerpts/instrumentLookup.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: instrumentLookup.py # Purpose: Multi-lingual instrument translation tables diff --git a/music21/languageExcerpts/naturalLanguageObjects.py b/music21/languageExcerpts/naturalLanguageObjects.py index 9f90cddea8..a9a64f0685 100644 --- a/music21/languageExcerpts/naturalLanguageObjects.py +++ b/music21/languageExcerpts/naturalLanguageObjects.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: naturalLanguageObjects.py # Purpose: Multilingual conversion of pitch, etc. objects diff --git a/music21/layout.py b/music21/layout.py index b748cde1c0..3f83def759 100644 --- a/music21/layout.py +++ b/music21/layout.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: layout.py # Purpose: Layout objects diff --git a/music21/lily/__init__.py b/music21/lily/__init__.py index a3f2afe3a2..e9ec4522e8 100644 --- a/music21/lily/__init__.py +++ b/music21/lily/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import annotations __all__ = [ diff --git a/music21/lily/lilyObjects.py b/music21/lily/lilyObjects.py index 21a876aafc..e9281d9231 100644 --- a/music21/lily/lilyObjects.py +++ b/music21/lily/lilyObjects.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: lily/objects.py # Purpose: python objects representing lilypond diff --git a/music21/lily/translate.py b/music21/lily/translate.py index dfba531bcb..4e8c23745e 100644 --- a/music21/lily/translate.py +++ b/music21/lily/translate.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: lily/translate.py # Purpose: music21 classes for translating to Lilypond diff --git a/music21/mei/__init__.py b/music21/mei/__init__.py index b1998e3c99..e018796c6a 100644 --- a/music21/mei/__init__.py +++ b/music21/mei/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: mei/__init__.py # Purpose: MEI: The Music Encoding Initiative modules and classes diff --git a/music21/mei/base.py b/music21/mei/base.py index ea25fc15f4..1a09d4380b 100644 --- a/music21/mei/base.py +++ b/music21/mei/base.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: mei/base.py # Purpose: Public interfaces for the MEI module diff --git a/music21/mei/test_base.py b/music21/mei/test_base.py index d936909276..adb601144f 100644 --- a/music21/mei/test_base.py +++ b/music21/mei/test_base.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: mei/test_main.py # Purpose: Tests for mei/base.py diff --git a/music21/metadata/__init__.py b/music21/metadata/__init__.py index 06443c1934..46deee8000 100755 --- a/music21/metadata/__init__.py +++ b/music21/metadata/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: metadata.py # Purpose: music21 classes for representing score and work metadata diff --git a/music21/metadata/bundles.py b/music21/metadata/bundles.py index f6b459a121..d04fabbd73 100644 --- a/music21/metadata/bundles.py +++ b/music21/metadata/bundles.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: bundles.py # Purpose: music21 classes for representing score and work metadata diff --git a/music21/metadata/caching.py b/music21/metadata/caching.py index f8caad9c10..33b3f4bd8b 100644 --- a/music21/metadata/caching.py +++ b/music21/metadata/caching.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: caching.py # Purpose: music21 classes for representing score and work metadata diff --git a/music21/metadata/primitives.py b/music21/metadata/primitives.py index 504453e5d8..6f36ad760c 100644 --- a/music21/metadata/primitives.py +++ b/music21/metadata/primitives.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: primitives.py # Purpose: music21 classes for representing score and work metadata diff --git a/music21/metadata/properties.py b/music21/metadata/properties.py index 2130cdc194..66dc260a6e 100644 --- a/music21/metadata/properties.py +++ b/music21/metadata/properties.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: properties.py # Purpose: Data describing the standard set of metadata properties diff --git a/music21/meter/__init__.py b/music21/meter/__init__.py index 525f44c1b9..0fabf58254 100644 --- a/music21/meter/__init__.py +++ b/music21/meter/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: meter.py # Purpose: Classes for meters diff --git a/music21/meter/base.py b/music21/meter/base.py index 7addc7ca35..848a9f9448 100644 --- a/music21/meter/base.py +++ b/music21/meter/base.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: meter.py # Purpose: Classes for meters diff --git a/music21/meter/core.py b/music21/meter/core.py index f2fd4e89f1..49e8522a37 100644 --- a/music21/meter/core.py +++ b/music21/meter/core.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: meter.core.py # Purpose: Component objects for meters diff --git a/music21/meter/tests.py b/music21/meter/tests.py index 403280c4a5..a3c0b85978 100644 --- a/music21/meter/tests.py +++ b/music21/meter/tests.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: meter.tests.py # Purpose: Tests of meter diff --git a/music21/meter/tools.py b/music21/meter/tools.py index 3a6629759a..014abbb653 100644 --- a/music21/meter/tools.py +++ b/music21/meter/tools.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: meter.tools.py # Purpose: Tools for working with meter diff --git a/music21/midi/__init__.py b/music21/midi/__init__.py index dc60c1458e..5e9c3256d1 100644 --- a/music21/midi/__init__.py +++ b/music21/midi/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: midi/__init__.py # Purpose: Access to MIDI library / music21 classes for dealing with midi data diff --git a/music21/midi/base.py b/music21/midi/base.py index 171c85fcb3..3b14b3f5b8 100644 --- a/music21/midi/base.py +++ b/music21/midi/base.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: midi/__init__.py # Purpose: Access to MIDI library / music21 classes for dealing with midi data diff --git a/music21/midi/percussion.py b/music21/midi/percussion.py index 6d02da859d..ecb7c93996 100644 --- a/music21/midi/percussion.py +++ b/music21/midi/percussion.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: midi/percussion.py # Purpose: music21 classes for representing pitches diff --git a/music21/midi/realtime.py b/music21/midi/realtime.py index 54b693dd7d..206ec2e819 100644 --- a/music21/midi/realtime.py +++ b/music21/midi/realtime.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: midi.realtime.py # Purpose: music21 classes for playing midi data in realtime diff --git a/music21/midi/translate.py b/music21/midi/translate.py index 84a3e6bc8a..585a11723a 100644 --- a/music21/midi/translate.py +++ b/music21/midi/translate.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: midi.translate.py # Purpose: Translate MIDI and music21 objects diff --git a/music21/musedata/__init__.py b/music21/musedata/__init__.py index 478f881951..d2226e4156 100644 --- a/music21/musedata/__init__.py +++ b/music21/musedata/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: musedata/__init__.py # Purpose: parses Walter Hewlett's MuseData format diff --git a/music21/musedata/base12_26.py b/music21/musedata/base12_26.py index 112c39147d..43e79e6d61 100644 --- a/music21/musedata/base12_26.py +++ b/music21/musedata/base12_26.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: base12_26.py # Purpose: Placeholder of Hewlett's base 40 system for 0th and 1st order (base12 and 26). diff --git a/music21/musedata/base40.py b/music21/musedata/base40.py index 2aa9b83912..f9f2761bc9 100644 --- a/music21/musedata/base40.py +++ b/music21/musedata/base40.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: base40.py # Purpose: Base40/Music21 Pitch/Interval Translator diff --git a/music21/musedata/testPrimitive/__init__.py b/music21/musedata/testPrimitive/__init__.py index 40a96afc6f..e69de29bb2 100644 --- a/music21/musedata/testPrimitive/__init__.py +++ b/music21/musedata/testPrimitive/__init__.py @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/music21/musedata/testPrimitive/test01/__init__.py b/music21/musedata/testPrimitive/test01/__init__.py index 40a96afc6f..e69de29bb2 100644 --- a/music21/musedata/testPrimitive/test01/__init__.py +++ b/music21/musedata/testPrimitive/test01/__init__.py @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/music21/musedata/translate.py b/music21/musedata/translate.py index 28b624078a..1b9826293d 100644 --- a/music21/musedata/translate.py +++ b/music21/musedata/translate.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: musedata.translate.py # Purpose: Translate MuseData into music21 objects diff --git a/music21/musicxml/__init__.py b/music21/musicxml/__init__.py index 731895b0ba..d4ba5d5fdf 100644 --- a/music21/musicxml/__init__.py +++ b/music21/musicxml/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: musicxml/__init__.py # Purpose: Access to musicxml library diff --git a/music21/musicxml/archiveTools.py b/music21/musicxml/archiveTools.py index 4840b5fc71..a996e8e975 100644 --- a/music21/musicxml/archiveTools.py +++ b/music21/musicxml/archiveTools.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: musicxml/archiveTools.py # Purpose: Tools for compressing and decompressing MusicXML files diff --git a/music21/musicxml/helpers.py b/music21/musicxml/helpers.py index 6c6135f127..b426a54214 100644 --- a/music21/musicxml/helpers.py +++ b/music21/musicxml/helpers.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: musicxml/helpers.py # Purpose: Helper routines for musicxml export diff --git a/music21/musicxml/lilypondTestSuite/__init__.py b/music21/musicxml/lilypondTestSuite/__init__.py index bde8883547..85b3ed0035 100644 --- a/music21/musicxml/lilypondTestSuite/__init__.py +++ b/music21/musicxml/lilypondTestSuite/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ''' The Lilypond MusicXML Test Suite comes from https://github.com/cuthbertLab/musicxmlTestSuite diff --git a/music21/musicxml/m21ToXml.py b/music21/musicxml/m21ToXml.py index c2c47868eb..96d0caa972 100644 --- a/music21/musicxml/m21ToXml.py +++ b/music21/musicxml/m21ToXml.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: musicxml/m21ToXml.py # Purpose: Translate from music21 objects to musicxml representation diff --git a/music21/musicxml/partStaffExporter.py b/music21/musicxml/partStaffExporter.py index 6efb735436..abe52486a4 100644 --- a/music21/musicxml/partStaffExporter.py +++ b/music21/musicxml/partStaffExporter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: musicxml/partStaffExporter.py # Purpose: Change music21 PartStaff objects to single musicxml parts diff --git a/music21/musicxml/testFiles.py b/music21/musicxml/testFiles.py index fe991e98fb..842c0f2a9e 100644 --- a/music21/musicxml/testFiles.py +++ b/music21/musicxml/testFiles.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ +# ------------------------------------------------------------------------------ # Name: testFiles.py # Purpose: MusicXML test files # diff --git a/music21/musicxml/testPrimitive.py b/music21/musicxml/testPrimitive.py index bee3baf4fa..1914116c8f 100644 --- a/music21/musicxml/testPrimitive.py +++ b/music21/musicxml/testPrimitive.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: testPrimitive.py # Purpose: MusicXML test files diff --git a/music21/musicxml/xmlObjects.py b/music21/musicxml/xmlObjects.py index 3d5049f86a..2342e50d8b 100644 --- a/music21/musicxml/xmlObjects.py +++ b/music21/musicxml/xmlObjects.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: musicxml/xmlObjects.py # Purpose: MusicXML objects for conversion to and from music21 diff --git a/music21/musicxml/xmlSoundParser.py b/music21/musicxml/xmlSoundParser.py index ff8c8aa62a..df9f47b94b 100644 --- a/music21/musicxml/xmlSoundParser.py +++ b/music21/musicxml/xmlSoundParser.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: musicxml/xmlSoundParser.py # Purpose: Translate the tag to music21 diff --git a/music21/musicxml/xmlToM21.py b/music21/musicxml/xmlToM21.py index 69c9bf9648..fee5e107dd 100644 --- a/music21/musicxml/xmlToM21.py +++ b/music21/musicxml/xmlToM21.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: musicxml/xmlToM21.py # Purpose: Conversion from MusicXML to Music21 diff --git a/music21/note.py b/music21/note.py index 887ef68488..7a56c69bf0 100644 --- a/music21/note.py +++ b/music21/note.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: note.py # Purpose: music21 classes for representing notes diff --git a/music21/noteworthy/__init__.py b/music21/noteworthy/__init__.py index 72cae6ac3a..50e1f0357a 100644 --- a/music21/noteworthy/__init__.py +++ b/music21/noteworthy/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: noteworthy/__init__.py # Purpose: parses NWCTXT Notation diff --git a/music21/noteworthy/binaryTranslate.py b/music21/noteworthy/binaryTranslate.py index 29bd804277..47ae916e44 100644 --- a/music21/noteworthy/binaryTranslate.py +++ b/music21/noteworthy/binaryTranslate.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: noteworthy/binaryTranslate.py # Purpose: parses .nwc binary files, compressed and uncompressed diff --git a/music21/noteworthy/translate.py b/music21/noteworthy/translate.py index d447350d62..7666fb8d45 100644 --- a/music21/noteworthy/translate.py +++ b/music21/noteworthy/translate.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: noteworthy/translate.py # Purpose: translates Noteworthy Composer's NWCTXT format diff --git a/music21/omr/__init__.py b/music21/omr/__init__.py index 38bb644a57..ff83626126 100644 --- a/music21/omr/__init__.py +++ b/music21/omr/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: omr/__init__.py # Purpose: music21 modules for improving and evaluating (not performing) OMR diff --git a/music21/omr/correctors.py b/music21/omr/correctors.py index 320704ced9..c6effb9263 100644 --- a/music21/omr/correctors.py +++ b/music21/omr/correctors.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: omr/correctors.py # Purpose: music21 modules for correcting the output from OMR software diff --git a/music21/omr/evaluators.py b/music21/omr/evaluators.py index a455147726..d1d79b377b 100644 --- a/music21/omr/evaluators.py +++ b/music21/omr/evaluators.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: omr/evaluators.py # Purpose: music21 module for evaluating correcting of output from OMR software diff --git a/music21/percussion.py b/music21/percussion.py index 9529361899..a799403432 100644 --- a/music21/percussion.py +++ b/music21/percussion.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: percussion.py # Purpose: music21 classes for representing unpitched events diff --git a/music21/pitch.py b/music21/pitch.py index 42a6c4cee2..065a4bcd00 100644 --- a/music21/pitch.py +++ b/music21/pitch.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: pitch.py # Purpose: music21 classes for representing pitches diff --git a/music21/prebase.py b/music21/prebase.py index b5e213ac53..18f8a2982d 100644 --- a/music21/prebase.py +++ b/music21/prebase.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: prebase.py # Purpose: classes for anything in music21 to inherit from. diff --git a/music21/repeat.py b/music21/repeat.py index 903207ab64..f0138c627d 100644 --- a/music21/repeat.py +++ b/music21/repeat.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: repeat.py # Purpose: Base classes for processing repeats diff --git a/music21/roman.py b/music21/roman.py index 407143fe9f..b8be71dead 100644 --- a/music21/roman.py +++ b/music21/roman.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: roman.py # Purpose: music21 classes for doing Roman Numeral / Tonal analysis diff --git a/music21/romanText/__init__.py b/music21/romanText/__init__.py index 78bed2c99a..91a652e2af 100644 --- a/music21/romanText/__init__.py +++ b/music21/romanText/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: romanText/__init__.py # Purpose: music21 classes for processing roman numeral analysis files diff --git a/music21/romanText/clercqTemperley.py b/music21/romanText/clercqTemperley.py index e4a3b99b77..222054003f 100644 --- a/music21/romanText/clercqTemperley.py +++ b/music21/romanText/clercqTemperley.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: clercqTemperley.py # Purpose: Routines to parse the popular music diff --git a/music21/romanText/rtObjects.py b/music21/romanText/rtObjects.py index 6f58ec7854..24a5c82d80 100644 --- a/music21/romanText/rtObjects.py +++ b/music21/romanText/rtObjects.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: romanText/rtObjects.py # Purpose: music21 objects for processing roman numeral analysis text files diff --git a/music21/romanText/testFiles.py b/music21/romanText/testFiles.py index 43baf1ff51..ed7e4d8f10 100644 --- a/music21/romanText/testFiles.py +++ b/music21/romanText/testFiles.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: romanText/base.py # Purpose: test files for roman numeral text analysis diff --git a/music21/romanText/translate.py b/music21/romanText/translate.py index 9bb2379a04..57f98ce00a 100644 --- a/music21/romanText/translate.py +++ b/music21/romanText/translate.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: romanText/translate.py # Purpose: Translation routines for roman numeral analysis text files diff --git a/music21/romanText/tsvConverter.py b/music21/romanText/tsvConverter.py index b1e7a962d9..bec9844517 100644 --- a/music21/romanText/tsvConverter.py +++ b/music21/romanText/tsvConverter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: romanText/tsvConverter.py # Purpose: Converter for the DCMLab's tabular format for representing harmonic analysis. diff --git a/music21/romanText/writeRoman.py b/music21/romanText/writeRoman.py index 839eab2bca..431f36486b 100644 --- a/music21/romanText/writeRoman.py +++ b/music21/romanText/writeRoman.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: romanText/writeRoman.py # Purpose: Writer for the 'RomanText' format diff --git a/music21/scale/__init__.py b/music21/scale/__init__.py index a425f49c3d..80e81d0eaf 100644 --- a/music21/scale/__init__.py +++ b/music21/scale/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: scale.py # Purpose: music21 classes for representing scales diff --git a/music21/scale/intervalNetwork.py b/music21/scale/intervalNetwork.py index c79224ba0d..82a475b792 100644 --- a/music21/scale/intervalNetwork.py +++ b/music21/scale/intervalNetwork.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: scale.intervalNetwork.py # Purpose: A graph of intervals, for scales and harmonies. diff --git a/music21/scale/scala/__init__.py b/music21/scale/scala/__init__.py index 3e4d85f266..b07156cade 100644 --- a/music21/scale/scala/__init__.py +++ b/music21/scale/scala/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: scala/__init__.py # Purpose: Interface and representation of Scala scale files diff --git a/music21/scale/scala/scl/__init__.py b/music21/scale/scala/scl/__init__.py index 40a96afc6f..e69de29bb2 100644 --- a/music21/scale/scala/scl/__init__.py +++ b/music21/scale/scala/scl/__init__.py @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/music21/scale/test_scale_main.py b/music21/scale/test_scale_main.py index df9e45bdde..b0b4cf5735 100644 --- a/music21/scale/test_scale_main.py +++ b/music21/scale/test_scale_main.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: scale.test_scale_main.py # Purpose: Tests for scale/__init__.py diff --git a/music21/search/__init__.py b/music21/search/__init__.py index 6d256f09a8..94ffddb2eb 100644 --- a/music21/search/__init__.py +++ b/music21/search/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: search/__init__.py # Purpose: music21 classes for searching within files diff --git a/music21/search/base.py b/music21/search/base.py index 3449ad3b61..0ddff09e88 100644 --- a/music21/search/base.py +++ b/music21/search/base.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: search/base.py # Purpose: music21 classes for searching within files diff --git a/music21/search/lyrics.py b/music21/search/lyrics.py index 32d7c673d6..a873e668b9 100644 --- a/music21/search/lyrics.py +++ b/music21/search/lyrics.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: search/lyrics.py # Purpose: music21 classes for searching lyrics diff --git a/music21/search/segment.py b/music21/search/segment.py index 6987f29899..e6f9158f26 100644 --- a/music21/search/segment.py +++ b/music21/search/segment.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: search/segment.py # Purpose: music21 classes for searching via segment matching diff --git a/music21/search/serial.py b/music21/search/serial.py index e59d374f03..5b61a577de 100644 --- a/music21/search/serial.py +++ b/music21/search/serial.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: search.serial.py # Purpose: music21 classes for serial searching diff --git a/music21/serial.py b/music21/serial.py index 741c718652..3ce2a86619 100644 --- a/music21/serial.py +++ b/music21/serial.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: serial.py # Purpose: music21 classes for serial transformations diff --git a/music21/sieve.py b/music21/sieve.py index f8066e0cd7..ec66a11e6c 100644 --- a/music21/sieve.py +++ b/music21/sieve.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: sieve.py # Purpose: sieve operations, after Iannis Xenakis. diff --git a/music21/sites.py b/music21/sites.py index cfcd1f542f..fc44ca46fc 100644 --- a/music21/sites.py +++ b/music21/sites.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: sites.py # Purpose: Objects for keeping track of relationships among Music21Objects diff --git a/music21/sorting.py b/music21/sorting.py index 7ada9a1281..ffc6dbd8e4 100644 --- a/music21/sorting.py +++ b/music21/sorting.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: sorting.py # Purpose: Music21 class for sorting diff --git a/music21/spanner.py b/music21/spanner.py index 9a1f64d163..a27efd7324 100644 --- a/music21/spanner.py +++ b/music21/spanner.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: spanner.py # Purpose: The Spanner base-class and subclasses diff --git a/music21/stream/__init__.py b/music21/stream/__init__.py index 9d86b16a1d..80c1715252 100644 --- a/music21/stream/__init__.py +++ b/music21/stream/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: stream/__init__.py # Purpose: base classes for dealing with groups of positioned objects diff --git a/music21/stream/base.py b/music21/stream/base.py index f62b3a04a1..33cfa587f9 100644 --- a/music21/stream/base.py +++ b/music21/stream/base.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: stream/base.py # Purpose: base classes for dealing with groups of positioned objects diff --git a/music21/stream/core.py b/music21/stream/core.py index b106fb97f3..0dc3019f5a 100644 --- a/music21/stream/core.py +++ b/music21/stream/core.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: stream/core.py # Purpose: mixin class for the core elements of Streams diff --git a/music21/stream/enums.py b/music21/stream/enums.py index 1088d95bde..52081bfe63 100644 --- a/music21/stream/enums.py +++ b/music21/stream/enums.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: stream/enums.py # Purpose: enumerations for streams diff --git a/music21/stream/filters.py b/music21/stream/filters.py index fdfce4f00a..296f3854f5 100644 --- a/music21/stream/filters.py +++ b/music21/stream/filters.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: stream/filters.py # Purpose: Classes for filtering iterators of streams diff --git a/music21/stream/iterator.py b/music21/stream/iterator.py index 1066ede0b2..5318f2291d 100644 --- a/music21/stream/iterator.py +++ b/music21/stream/iterator.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: stream/iterator.py # Purpose: Classes for walking through streams diff --git a/music21/stream/makeNotation.py b/music21/stream/makeNotation.py index cdcabf1518..693ae55f92 100644 --- a/music21/stream/makeNotation.py +++ b/music21/stream/makeNotation.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: makeNotation.py # Purpose: functionality for manipulating streams diff --git a/music21/stream/streamStatus.py b/music21/stream/streamStatus.py index 60e175d986..1830ec5cfc 100644 --- a/music21/stream/streamStatus.py +++ b/music21/stream/streamStatus.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: streamStatus.py # Purpose: Functionality for reporting on the notational status of streams diff --git a/music21/stream/tests.py b/music21/stream/tests.py index 5374e04c62..0de826fb5a 100644 --- a/music21/stream/tests.py +++ b/music21/stream/tests.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: stream/tests.py # Purpose: Tests for streams diff --git a/music21/stream/tools.py b/music21/stream/tools.py index 86f5c2844e..efd1f3fe6b 100644 --- a/music21/stream/tools.py +++ b/music21/stream/tools.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: stream/tools.py # Purpose: Additional tools for working with streams diff --git a/music21/style.py b/music21/style.py index a297a292df..2167a56681 100644 --- a/music21/style.py +++ b/music21/style.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: style.py # Purpose: Music21 classes for non-analytic display properties diff --git a/music21/tablature.py b/music21/tablature.py index 63a0ccf622..2c019b4252 100644 --- a/music21/tablature.py +++ b/music21/tablature.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: tablature.py # Purpose: Object for storing music21 information in the form of musical tablature. diff --git a/music21/tempo.py b/music21/tempo.py index ce6eae255e..3d51e260e7 100644 --- a/music21/tempo.py +++ b/music21/tempo.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: tempo.py # Purpose: Classes and tools relating to tempo diff --git a/music21/test/commonTest.py b/music21/test/commonTest.py index 1ca7ddfa31..b1922bd159 100644 --- a/music21/test/commonTest.py +++ b/music21/test/commonTest.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: commonTest.py # Purpose: Things common to testing diff --git a/music21/test/coverageM21.py b/music21/test/coverageM21.py index 9bf178fd1a..1fbe89f3a0 100644 --- a/music21/test/coverageM21.py +++ b/music21/test/coverageM21.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: coverageM21.py # Purpose: Starts Coverage w/ default arguments diff --git a/music21/test/memoryUsage.py b/music21/test/memoryUsage.py index dfb1b88042..1159cb7d11 100644 --- a/music21/test/memoryUsage.py +++ b/music21/test/memoryUsage.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import annotations from music21 import exceptions21 diff --git a/music21/test/multiprocessTest.py b/music21/test/multiprocessTest.py index 3d92a1c0b5..65804e9062 100644 --- a/music21/test/multiprocessTest.py +++ b/music21/test/multiprocessTest.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: multiprocesssTest.py # Purpose: Controller for all tests in music21 run concurrently. diff --git a/music21/test/testDefault.py b/music21/test/testDefault.py index 3cf43240a6..13bfe2a63f 100644 --- a/music21/test/testDefault.py +++ b/music21/test/testDefault.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: testDefault.py # Purpose: Controller for all tests in music21 in the default Environment. diff --git a/music21/test/testExternal.py b/music21/test/testExternal.py index 6292ed51c6..19ac47a78a 100644 --- a/music21/test/testExternal.py +++ b/music21/test/testExternal.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: testExternal.py # Purpose: Controller for all tests employing external software and diff --git a/music21/test/testLint.py b/music21/test/testLint.py index 522d1472d0..fdda175a65 100644 --- a/music21/test/testLint.py +++ b/music21/test/testLint.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: testLint.py # Purpose: Controller for all lint based testing. diff --git a/music21/test/testPerformance.py b/music21/test/testPerformance.py index cd161f6455..e4c3c6023b 100644 --- a/music21/test/testPerformance.py +++ b/music21/test/testPerformance.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: testPerformance.py # Purpose: Tests keep track of long-term performance targets diff --git a/music21/test/testRunner.py b/music21/test/testRunner.py index 335d48415e..519be56bc9 100644 --- a/music21/test/testRunner.py +++ b/music21/test/testRunner.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: testRunner.py # Purpose: Music21 testing suite diff --git a/music21/test/testSerialization.py b/music21/test/testSerialization.py index f7d9914863..4c6e1da140 100644 --- a/music21/test/testSerialization.py +++ b/music21/test/testSerialization.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: testSerialization.py # Purpose: tests for serializing music21 objects diff --git a/music21/test/testSingleCoreAll.py b/music21/test/testSingleCoreAll.py index c6ca26fc59..6fd06d6dda 100644 --- a/music21/test/testSingleCoreAll.py +++ b/music21/test/testSingleCoreAll.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: test.py # Purpose: Controller for all module tests in music21. diff --git a/music21/test/test_base.py b/music21/test/test_base.py index 436a474ae5..070a345567 100644 --- a/music21/test/test_base.py +++ b/music21/test/test_base.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: test.test_base.py # Purpose: music21 tests for Music21Objects etc. diff --git a/music21/test/test_metadata.py b/music21/test/test_metadata.py index ef8941a65e..3784dd4e36 100644 --- a/music21/test/test_metadata.py +++ b/music21/test/test_metadata.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from __future__ import annotations import re diff --git a/music21/test/test_pitch.py b/music21/test/test_pitch.py index b6f9783a61..3e92d0479d 100644 --- a/music21/test/test_pitch.py +++ b/music21/test/test_pitch.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: test.test_pitch.py # Purpose: music21 tests for pitches diff --git a/music21/test/timeGraphImportStar.py b/music21/test/timeGraphImportStar.py index 4e6719d9f0..02216e26d1 100644 --- a/music21/test/timeGraphImportStar.py +++ b/music21/test/timeGraphImportStar.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: timeGraphsImportStar.py # Purpose: time how long it takes to import music21, and report biggest offenders diff --git a/music21/test/timeGraphs.py b/music21/test/timeGraphs.py index 6eda847dcb..1bd200356f 100644 --- a/music21/test/timeGraphs.py +++ b/music21/test/timeGraphs.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: timeGraphs.py # Purpose: time how long it takes to run music21 commands diff --git a/music21/test/toggleDebug.py b/music21/test/toggleDebug.py index 3a47b891ba..f8cd8b72f4 100644 --- a/music21/test/toggleDebug.py +++ b/music21/test/toggleDebug.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: test.toggleDebug.py # Purpose: Changes debug on if off, off if on diff --git a/music21/test/treeYield.py b/music21/test/treeYield.py index a6d297d041..39ea72fa70 100644 --- a/music21/test/treeYield.py +++ b/music21/test/treeYield.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: treeYield.py # Purpose: traverse a complex datastructure and yield elements diff --git a/music21/test/warningMultiprocessTest.py b/music21/test/warningMultiprocessTest.py index c01905639e..8fce5fdaec 100644 --- a/music21/test/warningMultiprocessTest.py +++ b/music21/test/warningMultiprocessTest.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ''' Runs MultiprocessTest with all warnings including traceback ''' diff --git a/music21/text.py b/music21/text.py index a2e866c429..b3d443c1d9 100644 --- a/music21/text.py +++ b/music21/text.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: text.py # Purpose: music21 classes for text processing @@ -669,8 +668,8 @@ def testBasic(self): def testAssembleLyricsA(self): - from music21 import stream from music21 import note + from music21 import stream s = stream.Stream() for syl in ['hel-', '-lo', 'a-', '-gain']: n = note.Note() diff --git a/music21/tie.py b/music21/tie.py index f69afd462c..c1e6824764 100644 --- a/music21/tie.py +++ b/music21/tie.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: tie.py # Purpose: music21 classes for representing ties (visual and conceptual) diff --git a/music21/tinyNotation.py b/music21/tinyNotation.py index 6a5523e166..d2ffd3dd94 100644 --- a/music21/tinyNotation.py +++ b/music21/tinyNotation.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------- # Name: tinyNotation.py # Purpose: A simple notation input format. diff --git a/music21/tree/__init__.py b/music21/tree/__init__.py index 7a4058181b..edf8c211d3 100644 --- a/music21/tree/__init__.py +++ b/music21/tree/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: tree/__init__.py # Purpose: Tools for grouping notes and chords into a searchable tree diff --git a/music21/tree/analysis.py b/music21/tree/analysis.py index 0ad7674675..7ce5ebc62b 100644 --- a/music21/tree/analysis.py +++ b/music21/tree/analysis.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: tree/analysis.py # Purpose: horizontal analysis tools on timespan trees diff --git a/music21/tree/core.py b/music21/tree/core.py index 31a2f160cd..408c0e3e9f 100644 --- a/music21/tree/core.py +++ b/music21/tree/core.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: tree/core.py # Purpose: Core AVLTree object. To be optimized the hell out of. diff --git a/music21/tree/fromStream.py b/music21/tree/fromStream.py index 1995031c52..97e5cf10dd 100644 --- a/music21/tree/fromStream.py +++ b/music21/tree/fromStream.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: timespans/fromStream.py # Purpose: Tools for creating timespans from Streams diff --git a/music21/tree/node.py b/music21/tree/node.py index 9bfd64f405..c9f2d29480 100644 --- a/music21/tree/node.py +++ b/music21/tree/node.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: timespans/node.py # Purpose: Internal data structures for timespan collections diff --git a/music21/tree/spans.py b/music21/tree/spans.py index db5d02a59c..1571399d76 100644 --- a/music21/tree/spans.py +++ b/music21/tree/spans.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: tree/spans.py # Purpose: Tools for marking off spans of time that optionally contain diff --git a/music21/tree/timespanTree.py b/music21/tree/timespanTree.py index 0dcbfa9836..0065a3f784 100644 --- a/music21/tree/timespanTree.py +++ b/music21/tree/timespanTree.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: tree/timespanTree.py # Purpose: Subclasses of tree.trees.OffsetTree for manipulation @@ -814,9 +813,9 @@ def element(self, expr): class Test(unittest.TestCase): def testGetVerticalityAtWithKey(self): - from music21 import stream from music21 import key from music21 import note + from music21 import stream s = stream.Stream() s.insert(0, key.Key('C')) s.insert(0, note.Note('F#4')) diff --git a/music21/tree/toStream.py b/music21/tree/toStream.py index 797827edcc..38d617f996 100644 --- a/music21/tree/toStream.py +++ b/music21/tree/toStream.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: tree/toStream.py # Purpose: Tools for recreating streams from trees diff --git a/music21/tree/trees.py b/music21/tree/trees.py index 6fd8ab289c..07a8f04f89 100644 --- a/music21/tree/trees.py +++ b/music21/tree/trees.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ----------------------------------------------------------------------------- # Name: tree/trees.py # Purpose: Subclasses of tree.core.AVLTree for different purposes @@ -1482,8 +1481,8 @@ def testGetPositionAfterOffset(self): test that get position after works with an offset when the tree is built on SortTuples. ''' - from music21 import stream from music21 import note + from music21 import stream et = ElementTree() diff --git a/music21/tree/verticality.py b/music21/tree/verticality.py index 1ee2676fef..1b318d264d 100644 --- a/music21/tree/verticality.py +++ b/music21/tree/verticality.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ---------------------------------------------------------------------------- # Name: tree/verticality.py # Purpose: Object for dealing with vertical simultaneities in a diff --git a/music21/variant.py b/music21/variant.py index 5d963b152b..78bd8f9ff3 100644 --- a/music21/variant.py +++ b/music21/variant.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: variant.py # Purpose: Ossia and other variant reading tools diff --git a/music21/vexflow/__init__.py b/music21/vexflow/__init__.py index 0fc663b9be..6987fe9a9f 100644 --- a/music21/vexflow/__init__.py +++ b/music21/vexflow/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: vexflow/__init__.py # Purpose: music21 classes for converting music21 objects to vexflow diff --git a/music21/vexflow/toMusic21j.py b/music21/vexflow/toMusic21j.py index 479f025fa7..62ad8775bc 100644 --- a/music21/vexflow/toMusic21j.py +++ b/music21/vexflow/toMusic21j.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: vexflow/toMusic21j.py # Purpose: music21 classes for converting music21 objects to music21j diff --git a/music21/voiceLeading.py b/music21/voiceLeading.py index 46a39cdd88..95d3787ebc 100644 --- a/music21/voiceLeading.py +++ b/music21/voiceLeading.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: voiceLeading.py # Purpose: music21 classes for voice leading diff --git a/music21/volpiano.py b/music21/volpiano.py index e9063fbc6b..a59b9d9dcf 100644 --- a/music21/volpiano.py +++ b/music21/volpiano.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: volpiano.py # Purpose: music21 classes for converting to and from volpiano diff --git a/music21/volume.py b/music21/volume.py index 2b3a83d5ac..1b45fb3157 100644 --- a/music21/volume.py +++ b/music21/volume.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # Name: volume.py # Purpose: Objects for representing volume, amplitude, and related