Merge branch 'oauth2' into assemble

Author: rayluo

.gitignore

@@ -53,3 +53,6 @@ src/build
 # vim files
 *.swp
 
+# The test configuration file(s) could potentially contain credentials
+tests/config.json
+

tests/test_client.py

@@ -6,6 +6,10 @@
 except:  # Python 3
     from urllib.parse import urljoin
 import time
+try:
+    FileNotFoundError  # Python 3
+except NameError:
+    FileNotFoundError = IOError  # Python 2
 
 import requests