From: Neil Date: Thu, 15 May 2014 19:43:45 +0000 (+0200) Subject: pep8 cleanups X-Git-Tag: 0.1~261 X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=267b565150cc2e94e609bb7f8c4af46c498c4ae6;hp=885d6dcee051aefa7e72ecb6e5efceb7f6549345;p=naja.git pep8 cleanups --- diff --git a/tools/gen_sound.py b/tools/gen_sound.py index be54428..6e524e8 100644 --- a/tools/gen_sound.py +++ b/tools/gen_sound.py @@ -1,5 +1,5 @@ # Generate imperfect sine waves -# +# # Design notes. Produces ~= (user requested) s of raw audio # We're aiming for an 8-bit'ish effect, so we're going with # 8125 Hz, 8 bit sampling, but faking it out to @@ -13,6 +13,7 @@ import struct OUTPUT_RATE = 8125 DEFAULT_VOL = 95 + def gen_sine(freq, secs, volume): filename = 'beep%s.pcm' % freq # We generate freq cycles and sample that OUTPUT_RATE times @@ -36,24 +37,25 @@ def usage(): print 'Usage gen_sound [] []' print ' where is the frequency in Hz (int)' print ' [] is the time in seconds (float) - default 0.25' - print ' and [] is the volume (integer between 0 and 127) - default %s' % DEFAULT_VOL + print (' and [] is the volume (integer between 0 and 127)' + ' - default %s' % DEFAULT_VOL) if __name__ == "__main__": try: - freq = int(sys.argv[1]) - if len(sys.argv) > 2: - secs = float(sys.argv[2]) - else: - secs = 0.25 - if len(sys.argv) > 3: - volume = int(sys.argv[3]) - else: - volume = DEFAULT_VOL + freq = int(sys.argv[1]) + if len(sys.argv) > 2: + secs = float(sys.argv[2]) + else: + secs = 0.25 + if len(sys.argv) > 3: + volume = int(sys.argv[3]) + else: + volume = DEFAULT_VOL except Exception, exc: - usage() - print 'Error was', exc - sys.exit(1) + usage() + print 'Error was', exc + sys.exit(1) if volume > 128 or volume < 0: usage() @@ -65,6 +67,4 @@ if __name__ == "__main__": print 'Invalid freq: %s' % volume sys.exit(1) - gen_sine(freq, secs, volume) -