From 867615445882dd50150f99e40e83b1da39920f43 Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <rafael@activitycentral.com>
Date: Tue, 03 Jul 2012 22:32:53 +0000
Subject: pep8 fixes plus imports in one line

---
diff --git a/screencast_activity.py b/screencast_activity.py
index 86cd662..2c6ea6a 100644
--- a/screencast_activity.py
+++ b/screencast_activity.py
@@ -16,7 +16,8 @@
 
 """Screencast Activity: An activity for producing XO tutorials."""
 from gettext import gettext as _
-from dbus.service import method, signal as dbus_signal
+from dbus.service import method
+from dbus.service import signal as dbus_signal
 import fcntl
 import gobject
 import gtk
@@ -29,17 +30,18 @@ import signal
 import sys
 
 from sugar.activity import activity
-from sugar.activity.activity import ActivityToolbox, \
-     get_bundle_path, get_bundle_name
+from sugar.activity.activity import ActivityToolbox
+from sugar.activity.activity import get_bundle_path 
+from sugar.activity.activity import get_bundle_name
 from sugar.graphics.alert import NotifyAlert
 from sugar.graphics.combobox import ComboBox
 
 SERVICE = "org.laptop.Screencast"
 IFACE = SERVICE
 PATH = "/org/laptop/Screencast"
-
 OUTFILE = "/tmp/recordmydesktop.ogv"
 
+
 class ScreencastActivity(activity.Activity):
     """Screencast Activity as specified in activity.info"""
     def __init__(self, handle):
@@ -90,19 +92,19 @@ class ScreencastActivity(activity.Activity):
         self.qualitycombo.append_item("1", "medium quality video")
         self.qualitycombo.append_item("2", "low quality video")
         self.qualitycombo.set_active(2)
-        
+
         hbox2.add(self.qualitycombo)
         options = gtk.Alignment(0.5, 0, 0, 0)
         options.add(hbox2)
 
         # Status label.
         self.status = gtk.Label(_("Status: Stopped"))
-        
+
         hbox.pack_start(self.record, expand=False, padding=40)
         hbox.pack_start(self.stop, expand=False, padding=40)
 
         # Encoding progress bar
-        self.progressbar=gtk.ProgressBar(adjustment=None)
+        self.progressbar = gtk.ProgressBar(adjustment=None)
         self.progressbar.set_fraction(0)
         self.progressbar.set_text("0% complete")
 
@@ -117,7 +119,7 @@ class ScreencastActivity(activity.Activity):
         self.show_all()
         self.progressbar.hide()
 
-    def write_file (self, file_path):
+    def write_file(self, file_path):
         print "Saving file to %s" % file_path
         self.metadata['mime_type'] = 'video/ogg'
         #try:
@@ -165,19 +167,19 @@ class ScreencastActivity(activity.Activity):
         execargs = ["./recordmydesktop", "--no-frame", "--overwrite"] 
         if not self.audiocheckbox.get_active():
             execargs.append("--no-sound")
-        if self.qualitycombo.get_active()==0:
-            execargs.append("-v_quality") # in later versions seems to be --v_quality instead
+        if self.qualitycombo.get_active() == 0:
+            execargs.append("-v_quality")  # in later versions seems to be --v_quality instead
             execargs.append("0")
-        elif self.qualitycombo.get_active()==1:
-            execargs.append("-v_quality") # in later versions seems to be --v_quality instead
+        elif self.qualitycombo.get_active() == 1:
+            execargs.append("-v_quality")  # in later versions seems to be --v_quality instead
             execargs.append("31")
         execargs.append("-o")
         execargs.append(OUTFILE)
         self.childp = popen2.Popen3(execargs, "t", 0)
         flags = fcntl.fcntl(self.childp.childerr, fcntl.F_GETFL)
-        fcntl.fcntl(self.childp.childerr, fcntl.F_SETFL, flags|os.O_NONBLOCK)
+        fcntl.fcntl(self.childp.childerr, fcntl.F_SETFL, flags | os.O_NONBLOCK)
         flags = fcntl.fcntl(self.childp.fromchild, fcntl.F_GETFL)
-        fcntl.fcntl(self.childp.fromchild, fcntl.F_SETFL, flags|os.O_NONBLOCK)
+        fcntl.fcntl(self.childp.fromchild, fcntl.F_SETFL, flags | os.O_NONBLOCK)
         self.timed_id = gobject.timeout_add(1000, self.check_status_cb)
         self.status.set_text("Status: Recording")
 
@@ -191,14 +193,14 @@ class ScreencastActivity(activity.Activity):
         self.progressbar.show()
         while True:
             try:
-                strstdout=self.childp.fromchild.read()
-                self.counter_fraction=float(re.search("[0-9][0-9]?[0-9]?", strstdout).group())
-                percentage=self.counter_fraction/100.0
-                if percentage>1.0:
-                    percentage=1.0
+                strstdout = self.childp.fromchild.read()
+                self.counter_fraction = float(re.search("[0-9][0-9]?[0-9]?", strstdout).group())
+                percentage = self.counter_fraction / 100.0
+                if percentage > 1.0:
+                    percentage = 1.0
                 #print "PORCENTAJE %s " % str(percentage) 
                 self.progressbar.set_fraction(percentage)
-                self.progressbar.set_text("%d%%"%int(percentage*100)+' complete')
+                self.progressbar.set_text("%d%%"%int(percentage * 100)+' complete')
             except IOError:
                 gtk.main_iteration(block=False)
             except AttributeError:
@@ -237,7 +239,7 @@ class ScreencastActivity(activity.Activity):
                         err_line = self.childp.childerr.readline()
                         if err_line.startswith("STATE:ENCODING"):
                             if not self.timed_id2:
-                                self.timed_id2=gobject.timeout_add(300,self.update_counter)
+                                self.timed_id2=gobject.timeout_add(300, self.update_counter)
                             self.status.set_text("Status: Encoding, please wait")
                     except:
                         break
--
cgit v0.9.1