From 2357d98e223eb80e7cabab977d40b4841d1bac22 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Sat, 10 Sep 2011 06:50:09 +0000
Subject: Pylint cleanup

---
diff --git a/browser.py b/browser.py
index 47318bb..eac9e6a 100644
--- a/browser.py
+++ b/browser.py
@@ -176,7 +176,7 @@ class TabbedView(BrowserNotebook):
 
             return browser.containerWindow
         else:
-            browser = Browser(self)
+            browser = Browser()
             self._append_tab(browser)
 
             return browser.browser.containerWindow
@@ -193,7 +193,7 @@ class TabbedView(BrowserNotebook):
         self._update_tab_sizes()
 
     def add_tab(self, next_to_current=False):
-        browser = Browser(self)
+        browser = Browser()
 
         label = TabLabel(browser)
         label.connect('tab-close', self.__tab_close_cb)
@@ -297,7 +297,7 @@ class TabbedView(BrowserNotebook):
             self.remove_page(self.get_n_pages() - 1)
 
         for tab_session in tab_sessions:
-            browser = Browser(self)
+            browser = Browser()
             self._append_tab(browser)
             sessionstore.set_session(browser, tab_session)
 
@@ -372,7 +372,7 @@ class TabLabel(gtk.HBox):
 
     def __title_changed_cb(self, browser, pspec):
         if browser.props.title == "":
-           self._label.set_text(_('Untitled'))
+            self._label.set_text(_('Untitled'))
         else:
             self._label.set_text(browser.props.title)
 
@@ -386,10 +386,9 @@ class Browser(WebView):
                      ([])),
     }
 
-    def __init__(self, tabbed_view):
+    def __init__(self):
         WebView.__init__(self)
 
-        self.tabbed_view = tabbed_view
         self.history = HistoryListener()
         self.progress = ProgressListener()
 
diff --git a/webactivity.py b/webactivity.py
index 453c370..eefb169 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -171,15 +171,14 @@ def _set_accept_languages():
     logging.debug('LANG set')
 
 from browser import TabbedView
-from browser import Browser
 from webtoolbar import PrimaryToolbar
 from edittoolbar import EditToolbar
 from viewtoolbar import ViewToolbar
 import downloadmanager
 
 # TODO: make the registration clearer SL #3087
-import globalhistory # pylint: disable=W0611
-import filepicker # pylint: disable=W0611
+import globalhistory  # pylint: disable=W0611
+import filepicker  # pylint: disable=W0611
 
 from model import Model
 from sugar.presence.tubeconn import TubeConnection
@@ -200,7 +199,7 @@ class WebActivity(activity.Activity):
         _logger.debug('Starting the web activity')
 
         downloadmanager.remove_old_parts()
-        
+
         self._force_close = False
         self._tabbed_view = TabbedView()
         self._tabbed_view.connect('focus-url-entry', self._on_focus_url_entry)
--
cgit v0.9.1