# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1323562702 -3600
# Node ID c3c47581db46f648f56f0b2d18215a320de194b4
# Parent  02f31fb1a653026b34fcce3e556c2409e397ae88# Parent  42d9fec68cdd7ba8c8231590b90af61e99befa63
Merged general changes.

diff -r 02f31fb1a653 -r c3c47581db46 ula.py
--- a/ula.py	Sat Dec 10 22:49:37 2011 +0100
+++ b/ula.py	Sun Dec 11 01:18:22 2011 +0100
@@ -4,8 +4,6 @@
 Acorn Electron ULA simulation.
 """
 
-import itertools
-
 WIDTH = 640
 HEIGHT = 512
 INTENSITY = 255
@@ -283,7 +281,7 @@
 
     "Return an array representing the computer's memory."
 
-    return list(itertools.repeat(0, MAX_MEMORY))
+    return [0] * MAX_MEMORY
 
 def get_screen():
 
@@ -292,12 +290,7 @@
     x = 0
     screen = []
     while x < WIDTH:
-        y = 0
-        column = []
-        while y < HEIGHT:
-            column.append((0, 0, 0))
-            y += 1
-        screen.append(column)
+        screen.append([(0, 0, 0)] * HEIGHT)
         x += 1
     return screen
 
@@ -308,7 +301,6 @@
         i += 1
 
 # Test program providing coverage (necessary for compilers like Shedskin).
-# NOTE: Running this will actually cause an IndexError.
 
 if __name__ == "__main__":
     ula = get_ula()