# HG changeset patch # User Emmanuel Gil Peyrot # Date 1350758651 -7200 # Node ID d8aab27a2ab28e13c2911e5625fcca01ec7ad7fe # Parent 690b5faaa0e66fbe2e36faa4ecb9195c7dcd12b8 Add missing imports, and remove side-effects in asserts. diff --git a/pytouhou/formats/fmt.py b/pytouhou/formats/fmt.py --- a/pytouhou/formats/fmt.py +++ b/pytouhou/formats/fmt.py @@ -61,7 +61,8 @@ class FMT(list): assert track.wFormatTag == 1 # We don’t support non-PCM formats assert track.dwAvgBytesPerSec == track.dwSamplesPerSec * track.wBlockAlign assert track.wBlockAlign == track.wChannels * track.wBitsPerSample // 8 - assert b'\00\00\00\00' == file.read(4) + zero = file.read(4) + assert b'\00\00\00\00' == zero self.append(track) diff --git a/pytouhou/formats/t6rp.py b/pytouhou/formats/t6rp.py --- a/pytouhou/formats/t6rp.py +++ b/pytouhou/formats/t6rp.py @@ -25,6 +25,7 @@ from io import BytesIO from time import strftime from pytouhou.utils.helpers import read_string, get_logger +from pytouhou.formats import ChecksumError logger = get_logger(__name__) diff --git a/pytouhou/ui/music.py b/pytouhou/ui/music.py --- a/pytouhou/ui/music.py +++ b/pytouhou/ui/music.py @@ -71,7 +71,8 @@ class ZwavSource(InfiniteWaveSource): self._file = file - assert b'ZWAV' == self._file.read(4) + magic = self._file.read(4) + assert b'ZWAV' == magic self.audio_format = AudioFormat( channels=format.wChannels, diff --git a/pytouhou/ui/shader.py b/pytouhou/ui/shader.py --- a/pytouhou/ui/shader.py +++ b/pytouhou/ui/shader.py @@ -12,10 +12,11 @@ from pyglet.gl import (glCreateProgram, GL_FRAGMENT_SHADER, glShaderSource, glCompileShader, glGetShaderiv, GL_COMPILE_STATUS, GL_INFO_LOG_LENGTH, glGetShaderInfoLog, glAttachShader, glLinkProgram, - glGetProgramiv, GL_LINK_STATUS, glUseProgram, - glGetUniformLocation, glUniform1f, glUniform2f, - glUniform3f, glUniform4f, glUniform1i, glUniform2i, - glUniform3i, glUniform4i, glUniformMatrix4fv) + glGetProgramiv, glGetProgramInfoLog, GL_LINK_STATUS, + glUseProgram, glGetUniformLocation, glUniform1f, + glUniform2f, glUniform3f, glUniform4f, glUniform1i, + glUniform2i, glUniform3i, glUniform4i, + glUniformMatrix4fv) from ctypes import (c_char, c_char_p, c_int, POINTER, byref, cast, create_string_buffer)