diff options
| author |  Mason Larobina <mason.larobina@gmail.com> | 2009-06-23 16:06:30 +0800 |
|---|---|---|
| committer | Mason Larobina <mason.larobina@gmail.com> | 2009-06-23 16:06:30 +0800 |
| commit | b58b53ec93587bd9ddd8b2ec2fed63607ee8662b (patch) | |
| tree | 31aa02e58ab32bbf4077f27603513cb22f4b0178 | |
| parent | 7335fa2d650c4a3378484dfbc71ff572b5613b27 (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.
On branch experimental:
Changes to be committed:
modified: examples/data/uzbl/scripts/cookies.py
| -rwxr-xr-x | examples/data/uzbl/scripts/cookies.py | 8 |
1 files changed, 5 insertions, 3 deletions
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: |