Cleanups

2 files changed, 11 insertions, 11 deletions

diff --git a/src/__init__.py b/src/__init__.py
index 9aa367d..1cdfa48 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -9,18 +9,18 @@ class Browser(_hulahop.Browser):
     def __init__(self):
         _hulahop.Browser.__init__(self)
 
+    def get_browser(self):
+        return _hulahop.Browser.get_browser(self)
+
     def get_document(self):
-        browser = self.get_browser()
-        if not browser:
-            return None
-        else:
-            web_browser = browser.queryInterface(interfaces.nsIWebBrowser)
-            return web_browser.contentDOMWindow
+        if self.browser:
+            return self.browser.contentDOMWindow
+        return None
 
     def load_uri(self, uri):
-        browser = self.get_browser()
-        web_browser = browser.queryInterface(interfaces.nsIWebNavigation)
-        web_browser.loadURI(uri, interfaces.nsIWebNavigation.LOAD_FLAGS_NONE,
-                            None, None, None)
+        web_nav = self.browser.queryInterface(interfaces.nsIWebNavigation)
+        web_nav.loadURI(uri, interfaces.nsIWebNavigation.LOAD_FLAGS_NONE,
+                        None, None, None)
 
     document = property(get_document)
+    browser = property(get_browser)
diff --git a/src/hulahop-browser.cpp b/src/hulahop-browser.cpp
index cac3492..12324c4 100644
--- a/src/hulahop-browser.cpp
+++ b/src/hulahop-browser.cpp
@@ -204,5 +204,5 @@ PyObject *
 hulahop_browser_get_browser (HulahopBrowser *browser)
 {
     return PyObject_FromNSInterface(browser->browser,
-                                    NS_GET_IID(nsIWebBrowser), PR_FALSE);
+                                    NS_GET_IID(nsIWebBrowser));
 }