From 87b61970631dfbe825fe9c7c2678934b37ecc880 Mon Sep 17 00:00:00 2001 From: Lucian Branescu Mihaila Date: Thu, 17 Jun 2010 23:49:07 +0000 Subject: Fix some pep8 violations. --- diff --git a/browser.py b/browser.py index 952ec70..1d4124d 100644 --- a/browser.py +++ b/browser.py @@ -38,6 +38,7 @@ from palettes import ContentInvoker _ZOOM_AMOUNT = 0.1 + class TabbedView(gtk.Notebook): __gtype_name__ = 'TabbedView' @@ -51,9 +52,9 @@ class TabbedView(gtk.Notebook): self.props.show_border = False self.props.scrollable = True - + self.new_tab() - + def new_tab(self): browser = Browser() self._append_tab(browser) @@ -72,7 +73,7 @@ class TabbedView(gtk.Notebook): if os.path.exists(TabbedView.USER_SHEET): settings.set_property('user-stylesheet-uri', 'file:///' + TabbedView.USER_SHEET) - + self.append_page(browser, label) browser.show() @@ -87,7 +88,8 @@ class TabbedView(gtk.Notebook): def _get_current_browser(self): return self.get_nth_page(self.get_current_page()) - current_browser = gobject.property(type=object, getter=_get_current_browser) + current_browser = gobject.property(type=object, + getter=_get_current_browser) def get_session(self): tab_sessions = [] @@ -154,7 +156,8 @@ class TabLabel(gtk.HBox): self.emit('tab-close', self._browser) def __browser_is_setup_cb(self, browser): - browser.progress.connect('notify::location', self.__location_changed_cb) + browser.progress.connect('notify::location', + self.__location_changed_cb) browser.connect('notify::title', self.__title_changed_cb) #def __location_changed_cb(self, progress_listener, pspec): @@ -178,7 +181,6 @@ class Browser(webkit.WebView): #self.history = HistoryListener() #self.progress = ProgressListener() - def load_uri(self, uri): pass @@ -210,6 +212,7 @@ class Browser(webkit.WebView): #persist.saveURI(uri, self.doc_shell, None, None, None, local_file) pass + class PopupDialog(gtk.Window): def __init__(self): gtk.Window.__init__(self) diff --git a/downloadmanager.py b/downloadmanager.py index 211eb77..8905cf5 100644 --- a/downloadmanager.py +++ b/downloadmanager.py @@ -235,7 +235,7 @@ class Download: def onProgressChange64(self, web_progress, request, cur_self_progress, max_self_progress, cur_total_progress, max_total_progress): - percent = (cur_self_progress * 100) / max_self_progress + percent = (cur_self_progress * 100) / max_self_progress if (time.time() - self._last_update_time) < _MIN_TIME_UPDATE and \ (percent - self._last_update_percent) < _MIN_PERCENT_UPDATE: @@ -386,4 +386,4 @@ class _SaveLinkProgressListener(object): def onDataAvailable(self, request, context, inputStream, offset, count): self._external_listener.onDataAvailable(request, context, inputStream, - offset, count); + offset, count) diff --git a/filepicker.py b/filepicker.py index 4e52471..2d82270 100644 --- a/filepicker.py +++ b/filepicker.py @@ -29,6 +29,7 @@ from sugar.activity.activity import get_activity_root _temp_dirs_to_clean = [] + #TODO port to webkit def cleanup_temp_files(): while _temp_dirs_to_clean: diff --git a/linkbutton.py b/linkbutton.py index 3247c7b..466565a 100644 --- a/linkbutton.py +++ b/linkbutton.py @@ -40,7 +40,7 @@ class LinkButton(TrayButton, gobject.GObject): self.set_image(buf, color.split(',')[1], color.split(',')[0]) self.hash = hash - info = title +'\n'+ owner + info = title + '\n' + owner self.setup_rollover_options(info) def set_image(self, buf, fill='#0000ff', stroke='#4d4c4f'): diff --git a/messenger.py b/messenger.py index a1aacda..ee9d14e 100644 --- a/messenger.py +++ b/messenger.py @@ -42,10 +42,10 @@ class Messenger(ExportedGObject): def participant_change_cb(self, added, removed): _logger.debug('Participants change add=%s rem=%s' - %(added, removed)) + % (added, removed)) for handle, bus_name in added: _logger.debug('Add member handle=%s bus_name=%s' - %(str(handle), str(bus_name))) + % (str(handle), str(bus_name))) self.members.append(bus_name) for handle in removed: @@ -63,17 +63,17 @@ class Messenger(ExportedGObject): self.bus_name = self.tube.get_unique_name() if self.is_initiator: _logger.debug('Initialising a new shared browser, I am %s .' - %self.tube.get_unique_name()) + % self.tube.get_unique_name()) else: # sync with other members - _logger.debug('Joined I am %s .'%self.bus_name) + _logger.debug('Joined I am %s .' % self.bus_name) for member in self.members: if member != self.bus_name: - _logger.debug('Get info from %s' %member) + _logger.debug('Get info from %s' % member) self.tube.get_object(member, PATH).sync_with_members( self.model.get_links_ids(), dbus_interface=IFACE, reply_handler=self.reply_sync, error_handler=lambda - e:self.error_sync(e, 'transfering file')) + e: self.error_sync(e, 'transfering file')) self.entered = True @@ -86,7 +86,7 @@ class Messenger(ExportedGObject): link['owner'], link['thumb'], link['timestamp']) def error_sync(self, e, when): - _logger.error('Error %s: %s'%(when, e)) + _logger.error('Error %s: %s' % (when, e)) @dbus.service.method(dbus_interface=IFACE, in_signature='as', out_signature='ass', sender_keyword='sender') @@ -116,7 +116,7 @@ class Messenger(ExportedGObject): @dbus.service.signal(IFACE, signature='sssssd') def _add_link(self, url, title, color, owner, thumb, timestamp): '''Signal to send the link information (add)''' - _logger.debug('Add Link: %s '%url) + _logger.debug('Add Link: %s ' % url) def _add_link_receiver(self, url, title, color, owner, buf, timestamp, sender=None): @@ -125,4 +125,4 @@ class Messenger(ExportedGObject): if self.tube.self_handle != handle: thumb = base64.b64decode(buf) self.model.add_link(url, title, thumb, owner, color, timestamp) - _logger.debug('Added link: %s to linkbar.'%(url)) + _logger.debug('Added link: %s to linkbar.' % (url)) diff --git a/model.py b/model.py index 65e5647..48e7bdb 100644 --- a/model.py +++ b/model.py @@ -65,9 +65,9 @@ class Model(gobject.GObject): def deserialize(self, data): self.data = cjson.decode(data) - if not self.data.has_key('shared_links'): + if 'shared_links' not in self.data: self.data['shared_links'] = [] - if not self.data.has_key('deleted'): + if 'deleted' not in self.data: self.data['deleted'] = [] def get_links_ids(self): diff --git a/palettes.py b/palettes.py index e4219f3..200277a 100644 --- a/palettes.py +++ b/palettes.py @@ -79,7 +79,7 @@ class ContentInvoker(Invoker): class LinkPalette(Palette): - + def __init__(self, browser, title, url, owner_document): Palette.__init__(self) diff --git a/progresslistener.py b/progresslistener.py index fe9bd5c..1649c77 100644 --- a/progresslistener.py +++ b/progresslistener.py @@ -18,6 +18,7 @@ import gobject + class ProgressListener(gobject.GObject): _com_interfaces_ = interfaces.nsIWebProgressListener diff --git a/securitydialogs.py b/securitydialogs.py index 0c1563a..0ab64ee 100644 --- a/securitydialogs.py +++ b/securitydialogs.py @@ -16,6 +16,7 @@ import logging + class SecurityDialogs: _com_interfaces_ = interfaces.nsIBadCertListener diff --git a/sessionstore.py b/sessionstore.py index 7b78812..ae97cd2 100644 --- a/sessionstore.py +++ b/sessionstore.py @@ -19,6 +19,7 @@ import logging + def get_session(browser): session_history = browser.get_back_forward_list() @@ -29,11 +30,11 @@ def get_session(browser): def set_session(browser, data): session_history = browser.get_back_forward_list() - + _set_history(session_history, data) if data: - session_history.go_to_item(len(data) -1) + session_history.go_to_item(len(data) - 1) else: browser.load_uri('about:blank') @@ -53,7 +54,7 @@ def _get_history(history): def _set_history(history, history_data): history.clear() - + for entry_dict in history_data: logging.debug('entry_dict: %r' % entry_dict) diff --git a/webactivity.py b/webactivity.py index 69485f2..a68cc49 100644 --- a/webactivity.py +++ b/webactivity.py @@ -139,10 +139,10 @@ def _set_accept_languages(): lang = lang.split('_') # e.g. es-uy, es - pref = lang[0] + "-" + lang[1].lower() + ", " + lang[0] - + pref = lang[0] + "-" + lang[1].lower() + ", " + lang[0] + #TODO set locale for webkit - + logging.debug('LANG set') from browser import TabbedView @@ -428,7 +428,7 @@ class WebActivity(activity.Activity): self._tabbed_view.props.current_browser.zoom_out() return True elif gtk.gdk.keyval_name(event.keyval) == "plus" \ - or gtk.gdk.keyval_name(event.keyval) == "equal" : + or gtk.gdk.keyval_name(event.keyval) == "equal": _logger.debug('keyboard: Zoom in') self._tabbed_view.props.current_browser.zoom_in() return True -- cgit v0.9.1