Merge branch 'master' into master

Author: conradho

pythonanywhere/api.py

@@ -22,14 +22,23 @@
 class AuthenticationError(Exception):
     pass
 
+class NoTokenError(Exception):
+    pass
 
 def get_api_endpoint(flavour="webapps"):
     domain = os.environ.get('PYTHONANYWHERE_DOMAIN', 'pythonanywhere.com')
     return 'https://www.{domain}/api/v0/user/{{username}}/{flavour}/'.format(domain=domain, flavour=flavour)
 
 
 def call_api(url, method, **kwargs):
-    token = os.environ['API_TOKEN']
+    token = os.environ.get('API_TOKEN')
+    if token is None:
+        raise NoTokenError(
+            "Oops, you don't seem to have an API token.  "
+            "Please go to the 'Account' page on PythonAnywhere, then to the 'API Token' "
+            "tab.  Click the 'Create a new API token' button to create the token, then "
+            "start a new console and try running this script again."
+        )
     insecure = os.environ.get('PYTHONANYWHERE_INSECURE_API') == 'true'
     response = requests.request(
         method=method,

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='pythonanywhere',
-    version='0.3',
+    version='0.5',
     description='PythonAnywhere helper tools for users',
     long_description=long_description,
     url='https://github.com/pythonanywhere/helper_scripts/',