clean up

8 files changed, 9 insertions, 12 deletions

diff --git a/VisualMatchActivity.py b/VisualMatchActivity.py
index d0e46b8..319830a 100644
--- a/VisualMatchActivity.py
+++ b/VisualMatchActivity.py
@@ -535,7 +535,6 @@ class VisualMatchActivity(activity.Activity):
             self.metadata['sun'] = self.vmw.word_lists[2][1]
             self.metadata['earth'] = self.vmw.word_lists[2][2]
             self.metadata['editing_word_list'] = self.vmw.editing_word_list
-            print "saving editing_word_list %s" % (str(self.vmw.editing_word_list))
             self.metadata['mime_type'] = 'application/x-visualmatch'
             f = file(file_path, 'w')
             f.write(self._dump())
diff --git a/card.py b/card.py
index 5e9e0a0..a1d4303 100644
--- a/card.py
+++ b/card.py
@@ -1,5 +1,5 @@
-#Copyright (c) 2009, Walter Bender
-#Copyright (c) 2009, Michele Pratusevich
+#Copyright (c) 2009,10 Walter Bender
+#Copyright (c) 2009 Michele Pratusevich
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/deck.py b/deck.py
index 8a14d0d..ea84893 100644
--- a/deck.py
+++ b/deck.py
@@ -1,4 +1,4 @@
-#Copyright (c) 2009, Walter Bender
+#Copyright (c) 2009,10 Walter Bender
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/game.py b/game.py
index df214be..e2d4639 100644
--- a/game.py
+++ b/game.py
@@ -107,13 +107,13 @@ class Game():
             self.deck.index = deck_index
             _deck_start = ROW*COL+3
             _deck_stop = _deck_start+self.deck.count()
+            self._restore_word_list(
+                             saved_state[_deck_stop+3*self.matches:])
             self.deck.restore(saved_state[_deck_start:_deck_stop])
             self.grid.restore(self.deck, saved_state[0:ROW*COL])
             self._restore_selected(saved_state[ROW*COL:ROW*COL+3])
             self._restore_matches(
                              saved_state[_deck_stop:_deck_stop+3*self.matches])
-            self._restore_word_list(
-                             saved_state[_deck_stop+3*self.matches:])
         elif not self.joiner():
             _logger.debug("Starting new game.")
             self.deck = Deck(self.sprites, self.card_type,
diff --git a/gencards.py b/gencards.py
index d83cb55..b21c93d 100644
--- a/gencards.py
+++ b/gencards.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#Copyright (c) 2009, Walter Bender
+#Copyright (c) 2009,10 Walter Bender
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -106,7 +106,6 @@ def svg_circle_of_dots(n, x, y, stroke, fill):
     ny = oy+cos(a)*r
     svg_string = "%s%f%s%f%s" % ("<g\n   transform=\"translate(",x,", ",y,
                                  ")\">\n")
-    print svg_string
     for i in range(n):
         svg_string += svg_circle(nx,ny,3,stroke,fill,2)
         a += da
diff --git a/grid.py b/grid.py
index f7723dd..7c25ada 100644
--- a/grid.py
+++ b/grid.py
@@ -1,4 +1,4 @@
-#Copyright (c) 2009, Walter Bender
+#Copyright (c) 2009,10 Walter Bender
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/sprites.py b/sprites.py
index fe7c856..55180f5 100644
--- a/sprites.py
+++ b/sprites.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #Copyright (c) 2007-8, Playful Invention Company.
-#Copyright (c) 2008-9, Walter Bender
+#Copyright (c) 2008-10 Walter Bender
 
 #Permission is hereby granted, free of charge, to any person obtaining a copy
 #of this software and associated documentation files (the "Software"), to deal
@@ -228,7 +228,6 @@ class Sprite:
     def label_width(self):
         max = 0
         for i in range(len(self.labels)):
-            print "i %d" % (i)
             pl = self.sprites.canvas.create_pango_layout(self.labels[i])
             self.fd.set_size(int(self.scale[i]*pango.SCALE))
             pl.set_font_description(self.fd)
diff --git a/visualmatch.py b/visualmatch.py
index e38991d..9d5e2ff 100755
--- a/visualmatch.py
+++ b/visualmatch.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-#Copyright (c) 2009, Walter Bender
+#Copyright (c) 2009,10 Walter Bender
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by