Python2 fixes for talking directly to the camera

uilibs · Feb 14, 2016 · 9e20878 · 9e20878
1 parent 1116cfe
commit 9e20878
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/uvcclient/camera.py b/uvcclient/camera.py
@@ -54,7 +54,10 @@ def _safe_request(self, *args, **kwargs):
     def login(self):
         resp = self._safe_request('GET', '/')
         headers = dict(resp.getheaders())
-        self._cookie = headers['Set-Cookie']
+        try:
+            self._cookie = headers['Set-Cookie']
+        except KeyError:
+            self._cookie = headers['set-cookie']
         session = self._cookie.split('=')[1].split(';')[0]
 
         try:

diff --git a/uvcclient/main.py b/uvcclient/main.py
@@ -168,4 +168,7 @@ def main():
         if not camera:
             print('No such camera')
             return 1
-        sys.stdout.buffer.write(do_snapshot(camera))
+        if hasattr(sys.stdout, 'buffer'):
+            sys.stdout.buffer.write(do_snapshot(camera))
+        else:
+            sys.stdout.write(do_snapshot(camera))