Split the browser out to browser.py

3 files changed, 63 insertions, 27 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index b6c894a..bdd6daf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
 sugardir = $(pythondir)/hulahop
 sugar_PYTHON =		\
-	__init__.py
+	__init__.py	\
+	browser.py
 
 INCLUDES =					\
 	$(DEPS_CFLAGS)				\
diff --git a/src/__init__.py b/src/__init__.py
index 9810d76..879b38b 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -1,26 +1,22 @@
-from hulahop import _hulahop
-
-from _hulahop import shutdown
-
-_hulahop.startup()
-
-from xpcom import components
-from xpcom.components import interfaces
-
-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):
-        return self.browser.contentDOMWindow
-
-    def load_uri(self, uri):
-        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)
+# Copyright (C) 2007, Red Hat, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+from hulahop._hulahop import startup, shutdown
+
+startup()
+
+from hulahop.browser import Browser
diff --git a/src/browser.py b/src/browser.py
new file mode 100644
index 0000000..6f91184
--- /dev/null
+++ b/src/browser.py
@@ -0,0 +1,39 @@
+# Copyright (C) 2007, Red Hat, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+from hulahop import _hulahop
+
+from xpcom import components
+from xpcom.components import interfaces
+
+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):
+        return self.browser.contentDOMWindow
+
+    def load_uri(self, uri):
+        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)