From 0d843cbf06fbdaa2716893a978ff6741ee46b24a Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <rafael@activitycentral.com>
Date: Thu, 28 Apr 2011 16:59:35 +0000
Subject: pep8 fixes, being more polite

---
diff --git a/brain.py b/brain.py
index 4ceb47e..32b4581 100644
--- a/brain.py
+++ b/brain.py
@@ -33,11 +33,11 @@ BOTS = {
     _('Spanish'): { 'name': 'Sara',
                     'brain': 'bot/sara.brn',
                     'predicates': { 'nombre_bot': 'Sara',
-                                    'botmaster': 'la comunidad Azucar' } },
+                                    'botmaster': 'La comunidad Azucar' } },
     _('English'): { 'name': 'Alice',
                     'brain': 'bot/alice.brn',
                     'predicates': { 'name': 'Alice',
-                                    'master': 'the Sugar Community' } } }
+                                    'master': 'The Sugar Community' } } }
 
 
 def get_mem_info(tag):
@@ -122,7 +122,7 @@ def load(activity, voice, sorry=None):
             activity.set_cursor(old_cursor)
 
         if is_first_session:
-            hello = _("Hello, I'm a robot \"%s\". Ask me any question.") \
+            hello = _("Hello, I'm a robot \"%s\". Please ask me any question.") \
                     % BOTS[voice.friendlyname]['name']
             if sorry:
                 hello += ' ' + sorry
diff --git a/eye.py b/eye.py
index 72f058e..ce0119e 100644
--- a/eye.py
+++ b/eye.py
@@ -7,8 +7,8 @@
 #
 # Parts of Speak.activity are based on code from Measure.activity
 # Copyright (C) 2007  Arjun Sarwal - arjun@laptop.org
-# 
-#     Speak.activity is free software: you can redistribute it and/or modify
+#
+# Speak.activity is free software: you can redistribute it and/or modify
 #     it under the terms of the GNU General Public License as published by
 #     the Free Software Foundation, either version 3 of the License, or
 #     (at your option) any later version.
@@ -28,13 +28,14 @@ import gobject
 import cairo
 import math
 
+
 class Eye(gtk.DrawingArea):
     def __init__(self, fill_color):
         gtk.DrawingArea.__init__(self)
         self.connect("expose_event", self.expose)
         self.frame = 0
         self.blink = False
-        self.x, self.y = 0,0
+        self.x, self.y = 0, 0
         self.fill_color = fill_color
 
         # listen for clicks
@@ -67,17 +68,17 @@ class Eye(gtk.DrawingArea):
 
         if self.x is None or self.y is None:
             # look ahead, but not *directly* in the middle
-            if a.x + a.width/2 < self.parent.get_allocation().width/2:
+            if a.x + a.width / 2 < self.parent.get_allocation().width / 2:
                 cx = a.width * 0.6
             else:
                 cx = a.width * 0.4
             return cx, a.height * 0.6
 
         EYE_X, EYE_Y = self.translate_coordinates(
-                self.get_toplevel(), a.width/2, a.height/2)
+                self.get_toplevel(), a.width / 2, a.height / 2)
         EYE_HWIDTH = a.width
         EYE_HHEIGHT = a.height
-        BALL_DIST = EYE_HWIDTH/4
+        BALL_DIST = EYE_HWIDTH / 4
 
         dx = self.x - EYE_X
         dy = self.y - EYE_Y
@@ -95,23 +96,23 @@ class Eye(gtk.DrawingArea):
                 dx = dist * cosa
                 dy = dist * sina
 
-        return a.width/2 + dx, a.height/2 + dy
+        return a.width / 2 + dx, a.height / 2 + dy
 
     def expose(self, widget, event):
         self.frame += 1
         bounds = self.get_allocation()
 
         eyeSize = min(bounds.width, bounds.height)
-        outlineWidth = eyeSize/20.0
-        pupilSize = eyeSize/10.0
+        outlineWidth = eyeSize / 20.0
+        pupilSize = eyeSize / 10.0
         pupilX, pupilY = self.computePupil()
-        dX = pupilX - bounds.width/2.
-        dY = pupilY - bounds.height/2.
-        distance = math.sqrt(dX*dX + dY*dY)
-        limit = eyeSize/2 - outlineWidth*2 - pupilSize
+        dX = pupilX - bounds.width / 2.
+        dY = pupilY - bounds.height / 2.
+        distance = math.sqrt(dX * dX + dY * dY)
+        limit = eyeSize / 2 - outlineWidth * 2 - pupilSize
         if distance > limit:
-            pupilX = bounds.width/2 + dX*limit/distance
-            pupilY = bounds.height/2 + dY*limit/distance
+            pupilX = bounds.width / 2 + dX * limit / distance
+            pupilY = bounds.height / 2 + dY * limit / distance
 
         self.context = widget.window.cairo_create()
         #self.context.set_antialias(cairo.ANTIALIAS_NONE)
@@ -122,23 +123,23 @@ class Eye(gtk.DrawingArea):
 
         # background
         self.context.set_source_rgba(*self.fill_color.get_rgba())
-        self.context.rectangle(0,0,bounds.width,bounds.height)
+        self.context.rectangle(0, 0, bounds.width, bounds.height)
         self.context.fill()
 
         # eye ball
-        self.context.arc(bounds.width/2,bounds.height/2, eyeSize/2-outlineWidth/2, 0,360)
-        self.context.set_source_rgb(1,1,1)
+        self.context.arc(bounds.width / 2, bounds.height / 2, eyeSize / 2 - outlineWidth / 2, 0, 360)
+        self.context.set_source_rgb(1, 1, 1)
         self.context.fill()
 
         # outline
         self.context.set_line_width(outlineWidth)
-        self.context.arc(bounds.width/2,bounds.height/2, eyeSize/2-outlineWidth/2, 0,360)
-        self.context.set_source_rgb(0,0,0)
+        self.context.arc(bounds.width / 2, bounds.height / 2, eyeSize / 2 - outlineWidth / 2, 0, 360)
+        self.context.set_source_rgb(0, 0, 0)
         self.context.stroke()
 
         # pupil
-        self.context.arc(pupilX,pupilY,pupilSize,0,360)
-        self.context.set_source_rgb(0,0,0)
+        self.context.arc(pupilX, pupilY, pupilSize, 0, 360)
+        self.context.set_source_rgb(0, 0, 0)
         self.context.fill()
 
         self.blink = False
--
cgit v0.9.1