Merge commit 'dequis/experimental' into experimental

diff --git a/AUTHORS b/AUTHORS
index 05271cb..031a634 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,6 +29,7 @@ Contributors:
     (kmeaw) - fix for multibyte utf8 characters segfault
     (evocallaghan) - tiny patches
     Aaron Griffin (phrakture) - Makefile patches to build on OSX
+    Mason Larobina - os.environ.keys() & os.path.join fix in cookies.py
 
 Originaly based on http://trac.webkit.org/browser/trunk/WebKitTools/GtkLauncher/main.c
 Which is  copyrighted:

diff --git a/examples/data/uzbl/scripts/cookies.py b/examples/data/uzbl/scripts/cookies.py
index 1845c26..4f80359 100755 (executable)
--- a/examples/data/uzbl/scripts/cookies.py
+++ b/examples/data/uzbl/scripts/cookies.py
@@ -61,10 +61,12 @@ class FakeResponse:
         return FakeHeaders(self.argv)
 
 if __name__ == '__main__':
-    if os.environ['XDG_DATA_HOME']:
-               jar = cookielib.MozillaCookieJar(os.environ['XDG_DATA_HOME']+'/uzbl/cookies.txt')
+    if 'XDG_DATA_HOME' in os.environ.keys() and os.environ['XDG_DATA_HOME']:
+        jar = cookielib.MozillaCookieJar(\
+          os.path.join(os.environ['XDG_DATA_HOME'],'/uzbl/cookies.txt'))
     else:
-               jar = cookielib.MozillaCookieJar(os.environ['HOME']+'.local/share/uzbl/cookies.txt')
+        jar = cookielib.MozillaCookieJar(\
+          os.path.join(os.environ['HOME'],'.local/share/uzbl/cookies.txt'))
     try:
         jar.load()
     except: