From 0ff433d55c913056940af1efe8af8acde65dc44a Mon Sep 17 00:00:00 2001 From: titusz Date: Sun, 27 Oct 2013 18:32:22 +0100 Subject: [PATCH 1/4] .gitignore .idea --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 67886b7..c8dd074 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ build/ *.swp *.pyc sqrl.egg-info/ +.idea/ From 4298a41de91c319f4dde5d7d3655d4d49fd7787a Mon Sep 17 00:00:00 2001 From: titusz Date: Sun, 27 Oct 2013 18:49:22 +0100 Subject: [PATCH 2/4] fix: setup.py depends on pyinotify instead of py-notify --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 00df8a5..3888fbc 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ except: from disutils.core import setup -dependencies = ['docopt', 'ed25519', 'pyinotify'] +dependencies = ['docopt', 'ed25519', 'py-notify'] setup( name='sqrl', From 6f23b893da1223b819d0fe90f25b52e36b68539e Mon Sep 17 00:00:00 2001 From: titusz Date: Sun, 27 Oct 2013 21:29:56 +0100 Subject: [PATCH 3/4] fix: key.error 'HOME' env on windows --- sqrl/sqrl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqrl/sqrl.py b/sqrl/sqrl.py index 4b3f506..aaef92b 100755 --- a/sqrl/sqrl.py +++ b/sqrl/sqrl.py @@ -22,7 +22,7 @@ from docopt import docopt VERSION = "0.0.2" -HOME = os.environ['HOME'] +HOME = os.getenv('HOME') or os.getenv('USERPROFILE') CONFIG_DIR = '.config/sqrl/' WORKING_DIR = HOME + '/' + CONFIG_DIR From d32364390519bd18c36c843c7c9e284137082514 Mon Sep 17 00:00:00 2001 From: titusz Date: Sun, 27 Oct 2013 21:42:48 +0100 Subject: [PATCH 4/4] fix: duplicate questiomark --- sqrl/client/request.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sqrl/client/request.py b/sqrl/client/request.py index 6362700..77e9bae 100644 --- a/sqrl/client/request.py +++ b/sqrl/client/request.py @@ -28,8 +28,10 @@ def __init__(self, url, public_key): self.http = httplib.HTTPConnection(self.url.netloc, timeout=9) def _path(self): - res = [self.url.path, "?", self.url.query, - "&", self.params.get()] + res = [self.url.path] + if not "?" in self.url.path: + res.append("?") + res.extend([self.url.query, "&", self.params.get()]) return "".join(res) def get_url(self):