Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjosealonso <alonso@Alonso.(none)>2010-09-01 13:44:36 (GMT)
committer josealonso <alonso@Alonso.(none)>2010-09-01 13:44:36 (GMT)
commit6607f097cd32cb0bdcf8d8c34a972a1c7aee05a2 (patch)
treee9d1279db87487741ac29ffb22ff2cb562bca660
parent275ad02dee99e78d2afc24b1e850e964bf1c501b (diff)
parent39a280ca1e5cc2f327926d0d214e4f12a055e178 (diff)
Merge branch 'master' of git.sugarlabs.org:damxo-ski-on-numbers/mainline
Conflicts: track.py
-rwxr-xr-xtrack.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/track.py b/track.py
index 6853dc6..c5f74f3 100755
--- a/track.py
+++ b/track.py
@@ -1,9 +1,10 @@
+# -*- coding: utf-8 -*-
#Actividad Esquiador
#Archivo: track.py
#Descripcion: Clase que maneja el archivo track1.tr con el escenario del juego
#
-import io
+import sys
import random
import pygame
from pygame import *
@@ -18,7 +19,7 @@ class Track():
#Carga del archivo track1.tr para poner las texturas del juego
def load(self, filename = "track4.tr"):
- file = io.open(filename)
+ file = open(filename, 'r')
self.lines = file.readlines()
def draw(self, screen, offset = 0):