Import cleanup

src/AnimationPlayer.py

@@ -21,15 +21,13 @@
 #####################################################################
 from __future__ import with_statement
 import os
-import sys
 
 from math import fabs as abs # Absolute value
 
 import pygame
 from pygame.locals import *
 
 from OpenGL.GL import *
-from OpenGL.GLU import *
 # Array-based drawing
 from numpy.core import array, float32
 

src/Camera.py

@@ -19,8 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,        #
 # MA  02110-1301, USA.                                              #
 #####################################################################
+from OpenGL.GLU import gluLookAt
+
 
-from OpenGL.GLU import *
 
 class Camera:
   def __init__(self):

src/Credits.py

@@ -25,9 +25,7 @@
 from __future__ import with_statement
 
 import pygame
-import OpenGL
-from OpenGL.GL import *
-from OpenGL.GLU import *
+from OpenGL.GL import OpenGL, glColor4f, glTranslatef
 #evilynux: needed for multi-OS file fetching
 import os
 

src/Data.py

@@ -26,9 +26,7 @@
 from Font import Font
 from Svg import ImgDrawing
 from Audio import Sound
-from Language import _
 import random
-import Language
 import Config
 import Version
 #myfingershurt: needed for multi-OS file fetching

src/Debug.py

@@ -24,13 +24,15 @@
 
 from __future__ import with_statement
 
-from OpenGL.GL import *
 from View import Layer
-
+from OpenGL.GL import glColor3f
 import gc
 import threading
 import Log
 
+
+
+
 class DebugLayer(Layer):
   """A layer for showing some debug information."""
   def __init__(self, engine):

src/Dialogs.py

@@ -32,7 +32,6 @@
 
 import pygame
 from OpenGL.GL import *
-from OpenGL.GLU import *
 import math
 import os
 import fnmatch

src/GameResultsScene.py

@@ -33,7 +33,6 @@
 import Scorekeeper
 import Dialogs
 import Song
-import Data
 from Menu import Menu
 from Audio import Sound
 from Language import _

src/Guitar.py

@@ -34,6 +34,8 @@
 from Shader import shaders
 
 from Instrument import *
+from OpenGL.GL import *
+import Song
 
 class Guitar(Instrument):
   def __init__(self, engine, playerObj, editorMode = False, player = 0, bass = False):

src/Instrument.py

@@ -21,16 +21,15 @@
 #####################################################################
 
 
-from OpenGL.GL import *
+
 
 #myfingershurt: needed for multi-OS file fetching
-import os
+from Song import Note, Tempo
 import Log
-
 import math
+import os
+
 
-from Song import Note, Tempo
-import Song   #need the base song defines as well
 
 class Instrument:
   def __init__(self, engine, playerObj, player = 0):

src/MainMenu.py

@@ -23,7 +23,6 @@
 # MA  02110-1301, USA.                                              #
 #####################################################################
 
-from OpenGL.GL import *
 
 from View import BackgroundLayer
 from Menu import Menu

src/Rockmeter.py

@@ -26,7 +26,6 @@
 import Config
 import os
 
-from OpenGL.GL import *
 from Svg import ImgDrawing
 
 import locale
@@ -35,6 +34,7 @@
 #from Draw import *
 
 from PIL import Image, ImageDraw
+from OpenGL.GL import glColor3f
 
 #these are the variables for setting the alignment of text and images
 #when setting them up in the rockmeter.ini you do not have

src/SongChoosingScene.py

@@ -32,7 +32,6 @@
 import Song
 import Config
 import pygame
-from OpenGL.GL import *
 import Version
 from Menu import Menu
 from Settings import ConfigChoice, ActiveConfigChoice

src/Svg.py

@@ -25,7 +25,7 @@
 from OpenGL.GL import *
 
 import numpy as np
-from numpy.core import array, float32
+from numpy.core import float32
 import math
 import cmgl
 

src/View.py

@@ -23,7 +23,6 @@
 
 from __future__ import division
 from OpenGL.GL import *
-from OpenGL.GLU import *
 from contextlib import contextmanager
 
 import numpy as np