Update imports

[ghextris.git] / ghextris.py

diff --git a/ghextris.py b/ghextris.py
index 8b29920504310fc45794d37ab36852c1852e0da7..f60c4c83179d76a4ffffeb187f8517d2ac44fe40 100755 (executable)
--- a/ghextris.py
+++ b/ghextris.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3
+#!/usr/bin/python2
 
 # Gnome-hextris; a free rewrite of the xhextris game in Python for Gnome
 # Copyright 2004 Mikko Rauhala <mjr@iki.fi>
@@ -29,14 +29,15 @@ import pygtk
 pygtk.require("2.0")
 
 import gtk
-import gnome.canvas
+import gnomecanvas
 import gnome
+import gnome.ui
 import gobject
 import gtk.glade
 
 import gettext
 
-import whrandom
+import random
 
 class Hextris:
     def __init__(self):
@@ -216,7 +217,7 @@ class Hextris:
             self.rowgroups.append(self.board.add("GnomeCanvasGroup", x = 0,
                                                  y = i * self.pieceheight))
         
-        self.nextnum = whrandom.randint(0, 9)
+        self.nextnum = random.randint(0, 9)
         self.next_piece()
 
         if self.running == False:
@@ -277,7 +278,7 @@ class Hextris:
         win.connect("key-press-event", self.key_handler)
         self.init_board()
 
-        whrandom.seed()
+        random.seed()
 
         self.update_appbar()
 
@@ -285,7 +286,7 @@ class Hextris:
 
     def next_piece(self):
         self.piecenum = self.nextnum
-        self.nextnum = whrandom.randint(0, 9)
+        self.nextnum = random.randint(0, 9)
         self.attitude = 0
         self.piece_x = (self.cols/2)-1 + self.deltax[self.piecenum]
         self.piece_y = -3 + self.deltax[self.piecenum]