Merge with upstream

Author: filiplajszczak

.gitignore

@@ -82,7 +82,7 @@ celerybeat-schedule
 venv/
 ENV/
 
-#PyChram project folder
+#PyCharm project folder
 .idea/
 
 # Spyder project settings

pythonanywhere/api.py

@@ -26,6 +26,7 @@ class AuthenticationError(Exception):
 class NoTokenError(Exception):
     pass
 
+
 def get_api_endpoint():
     domain = os.environ.get('PYTHONANYWHERE_DOMAIN', 'pythonanywhere.com')
     return 'https://www.{domain}/api/v0/user/{{username}}/{{flavor}}/'.format(domain=domain)

scripts/pa_install_webapp_letsencrypt_ssl.py

@@ -27,6 +27,7 @@ def main(domain_name, suppress_reload):
         os.path.join(homedir, 'letsencrypt', domain_name),
         os.path.join(homedir, 'letsencrypt', 'certs', domain_name),
     )
+    done = False
     for path in possible_paths:
         certificate_file = os.path.join(path, 'fullchain.pem')
         private_key_file = os.path.join(path, 'privkey.pem')

setup.py

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

tests/test_snakesay.py

@@ -14,22 +14,22 @@ def test_two_lines():
     two_lines = 'a' * 81
     message = snakesay(two_lines)
     print(message)
-    assert r'/ aaaaaa' in message
-    assert 'aaaaaa \\' in message
-    assert r'\ aaaaaa' in message
+    assert '/ ' in message
+    assert '| aaaaa' in message
+    assert 'aaaaa |' in message
+    assert '\\ ' in message
 
 
 def test_three_lines():
     three_lines = 'a' * 80 * 2 + 'a'
     long_message = snakesay(three_lines)
     print(long_message)
-    assert r'/ aaaaaa' in long_message
-    assert 'aaaaaa \\' in long_message
+    assert '/ ' in long_message
 
-    assert r'| aaaaaa' in long_message
-    assert r'aaaaaa |' in long_message
+    assert '| aaaaaa' in long_message
+    assert 'aaaaaa |' in long_message
 
-    assert r'\ aaaaaa' in long_message
+    assert '\\ ' in long_message
 
 
 def test_multiple_arguments():