Fix tests, imports and readme

README.md

@@ -18,9 +18,9 @@ $ python
 Python 2.7.2 (default, Jun 20 2012, 16:23:33)
 [GCC 4.2.1 Compatible Apple Clang 4.0 (tags/Apple/clang-418.0.60)] on darwin
 Type "help", "copyright", "credits" or "license" for more information.
->>> import melopy
->>> melopy.major_scale('C5')
-['C5', 'D5', 'E5', 'F5', 'G5', 'A5', 'B5']
+>>> from melopy.scales import generateScale
+>>> generateScale('major', 'c4')
+['C4', 'D4', 'E4', 'F4', 'G4', 'A4', 'B4', 'C5']
 >>>
 ```
 
@@ -39,7 +39,7 @@ For examples, check out the `examples` directory:
 
 To run the tests:
 
-    $ python tests/melopy_tests.py
+    $ python tests.py
 
 ### Organization
 

README.txt

@@ -24,8 +24,8 @@ Load it
     Python 2.7.2 (default, Jun 20 2012, 16:23:33)
     [GCC 4.2.1 Compatible Apple Clang 4.0 (tags/Apple/clang-418.0.60)] on darwin
     Type "help", "copyright", "credits" or "license" for more information.
-    >>> import melopy
-    >>> melopy.major_scale('C5')
+    >>> from melopy.scales import generateScale
+    >>> generateScale('major', 'C5')
     ['C5', 'D5', 'E5', 'F5', 'G5', 'A5', 'B5']
     >>>
 
@@ -51,7 +51,7 @@ To run the tests:
 
 ::
 
-    $ python tests/melopy_tests.py
+    $ python tests.py
 
 Organization
 ============

melopy/chords.py

@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from utility import note_to_key, key_to_note, iterate
-from exceptions import MelopyGenericError
+from __future__ import absolute_import, division
+from melopy.utility import note_to_key, key_to_note, iterate
+from melopy.exceptions import MelopyGenericError
 
 CHORD_INTERVALS = {
     'maj': [4,3],

melopy/melopy.py

@@ -1,11 +1,13 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import division, absolute_import
+
 import wave, struct, random, math
 import os, sys
 
-from utility import *
-from scales  import *
+from melopy.utility import *
+from melopy.scales  import *
 
 # same included wave functions
 # a function of frequency and tick

melopy/scales.py

@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from utility import note_to_key, key_to_note, iterate
-from exceptions import MelopyGenericError
+from __future__ import absolute_import, division
+from melopy.utility import note_to_key, key_to_note, iterate
+from melopy.exceptions import MelopyGenericError
 
 SCALE_STEPS = {
     "major":[2,2,1,2,2,2,1],

melopy/utility.py

@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import division, absolute_import
 from math import log
-from exceptions import MelopyGenericError, MelopyValueError
+from melopy.exceptions import MelopyGenericError, MelopyValueError
 
 def key_to_frequency(key):
     """Returns the frequency of the note (key) keys from A0"""
@@ -11,7 +12,7 @@ def key_to_frequency(key):
 def key_to_note(key, octaves=True):
     """Returns a string representing a note which is (key) keys from A0"""
     notes = ['a','a#','b','c','c#','d','d#','e','f','f#','g','g#']
-    octave = (key + 8) / 12
+    octave = (key + 8) // 12
     note = notes[(key - 1) % 12]
 
     if octaves:

tests/melopy_tests.py → tests.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, nested_scopes
 
 import unittest