diff options
author | Mason Larobina <mason.larobina@gmail.com> | 2009-06-23 21:56:14 +0200 |
---|---|---|
committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-06-23 21:56:14 +0200 |
commit | 751540cae0bca8938393373348aa75488a122bc6 (patch) | |
tree | 7c53b841c1379ffb7de866609ae7c2aecee49af6 | |
parent | 12af838675fa5eae32a8b97cf8fe81c2c812639f (diff) | |
parent | b58b53ec93587bd9ddd8b2ec2fed63607ee8662b (diff) |
Checks if XDA_DATA_HOME in os.environ before use
Additionally when XDA_DATA_HOME doesn't exist the cookie jar location
defaults to os.environ["HOME"] + '.local/share/uzbl/cookies.txt'
however when these strings are concatenated they are missing the path
seperator '/'. Problem solved by using the builtin os.path.join to join
the environ path and jar location.
-rw-r--r-- | AUTHORS | 1 | ||||
-rwxr-xr-x | examples/data/uzbl/scripts/cookies.py | 8 |
2 files changed, 6 insertions, 3 deletions
@@ -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 --- 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: |