Reformat files

Author: regisf

Application/App/Admin/codeshandler.py

@@ -17,15 +17,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from tornadoext.requesthandler import RequestHandler, admin_auth_required
-
 from App.models.preference import Config
+from tornadoext.requesthandler import RequestHandler, admin_auth_required
 
 
 class CodesHandler(RequestHandler):
     """
     Handle all codes for analytics or twitter,
     """
+
     @admin_auth_required
     def get(self):
         config = Config()
@@ -67,4 +67,4 @@ def post(self):
         self.settings['twitter_consumer_key'] = config.get('twitter_consumer_key')
         self.settings['twitter_consumer_secret'] = config.get('twitter_consumer_secret')
 
-        self.redirect('/admin/codes/')
+        self.redirect('/admin/codes/')

Application/App/Admin/emailshandler.py

@@ -17,9 +17,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from tornadoext.requesthandler import RequestHandler, admin_auth_required
 from App.models.email import EmailModel
 from App.models.preference import PreferenceModel
+from tornadoext.requesthandler import RequestHandler, admin_auth_required
 
 
 def control_arguments(handler, edit=False):

Application/App/Admin/mainhandler.py

@@ -17,10 +17,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+from App.models.regex import RegexModel
+from App.models.user import UserModel
 from tornadoext.requesthandler import RequestHandler, admin_auth_required
 
-from App.models.user import UserModel
-from App.models.regex import RegexModel
 
 class AdminHandler(RequestHandler):
     @admin_auth_required

Application/App/Admin/preferencehandler.py

@@ -17,9 +17,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from tornadoext.requesthandler import RequestHandler, admin_auth_required
-
 from App.models.preference import PreferenceModel
+from tornadoext.requesthandler import RequestHandler, admin_auth_required
 
 
 class PreferenceHandler(RequestHandler):
@@ -35,4 +34,3 @@ def post(self):
         server_password = self.get_argument("serverpassword", "")
         PreferenceModel().save_mail_server(default_email, server_name, server_port, server_username, server_password)
         self.redirect("/admin/emails/")
-

Application/App/Admin/urls.py

@@ -23,11 +23,11 @@
 
 __author__ = 'Regis FLORET'
 
-from App.Admin.mainhandler import AdminHandler, LoginHandler, LogoutHandler
-from App.Admin.usershandler import UsersHandler, UsersEditHandler, UsersDeleteHandler, UsersAddHandler
+from App.Admin.codeshandler import CodesHandler
 from App.Admin.emailshandler import EmailsHandler, EmailsAddHandler, EmailsDeleteHandler, EmailEditHandler
+from App.Admin.mainhandler import AdminHandler, LoginHandler, LogoutHandler
 from App.Admin.preferencehandler import PreferenceHandler
-from App.Admin.codeshandler import CodesHandler
+from App.Admin.usershandler import UsersHandler, UsersEditHandler, UsersDeleteHandler, UsersAddHandler
 
 URLS = [
     (r'^/admin/$', AdminHandler),
@@ -47,5 +47,3 @@
 
     (r'/admin/codes/$', CodesHandler),
 ]
-
-

Application/App/Admin/usershandler.py

@@ -17,9 +17,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from tornadoext.requesthandler import RequestHandler, admin_auth_required
-
 from App.models.user import UserModel
+from tornadoext.requesthandler import RequestHandler, admin_auth_required
 
 
 class UsersHandler(RequestHandler):
@@ -73,7 +72,7 @@ def post(self, name):
         """
         Execution page
         """
-        #TODO: Test if the user to delete is not the user and not the last admin
+        # TODO: Test if the user to delete is not the user and not the last admin
         UserModel().delete(name)
         self.redirect('/admin/users/')
 
@@ -82,6 +81,7 @@ class UsersAddHandler(RequestHandler):
     """
     Add a new user
     """
+
     @admin_auth_required
     def get(self):
         self.render('admin/users/add.html', errors={})
@@ -92,33 +92,23 @@ def post(self):
         The user is created
         """
         errors = {}
-        user_model = UserModel()
 
         username = self.get_argument('username')
         email = self.get_argument('email')
         password = self.get_argument('password')
-        confirm = self.get_argument('confirm')
         is_admin = self.get_argument('is_admin', 'off') == 'on'
 
         if not email:
             errors['email'] = 'An email address is required'
 
         if not username:
             errors['username'] = 'Username cannot be empty'
-        # elif user_model.exists(username):
-        #     errors['username'] = 'User name exists'
 
         if not password:
             errors['password'] = 'Password is empty'
 
-        # if password and (password != confirm):
-        #     errors['password'] = 'Password and its confirmation are different'
-
-        add_another = 'add_another' in self.request.arguments
-        continue_edit = 'continue_edit' in self.request.arguments
-
         if errors.keys():
             self.render('admin/users/add.html', errors=errors)
 
         UserModel().create_user(username, email, password, is_admin=is_admin)
-        self.redirect('/admin/users/')
+        self.redirect('/admin/users/')

Application/App/Home/ajaxhandler.py

@@ -24,12 +24,13 @@
 
 print("Restart")
 
+
 class AjaxHandler(tornado.web.RequestHandler, PyRegex):
     def get(self):
         if self.request.headers.get('X-Requested-With') == 'XMLHttpRequest':
             try:
                 value = json.loads(self.get_argument('json', None))
                 print(value)
-                self.write(self.doTheJob(value))
+                self.write(self.do_the_job(value))
             except TypeError as e:
                 self.write(json.dumps({'success': False, 'error': e}))

Application/App/Home/connecthandler.py

@@ -1,4 +1,3 @@
-
 # -*- coding: utf-8 -*-
 #
 # Python-regex.com : Regular expression as in Kodos3 but for the web
@@ -18,19 +17,18 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import json
 import binascii
+import json
 import os
 
-from tornado.web import authenticated, HTTPError
 from tornado.auth import GoogleOAuth2Mixin, TwitterMixin, FacebookGraphMixin
 from tornado.gen import coroutine
+from tornado.web import authenticated, HTTPError
 
-from tornadoext.requesthandler import RequestHandler
-from tornadoext.oauth import GithubMixin, LinkedInMixin
-
-from App.models.user import UserModel
 from App.models.preference import Config
+from App.models.user import UserModel
+from tornadoext.oauth import GithubMixin, LinkedInMixin
+from tornadoext.requesthandler import RequestHandler
 
 
 class LoginHandler(RequestHandler):
@@ -59,6 +57,7 @@ class LogoutHandler(RequestHandler):
     """
     Disconnect the user and go to the main page
     """
+
     @authenticated
     def get(self):
         self.add_flash_message(0, "You are now disconnected.")
@@ -70,6 +69,7 @@ class GoogleOAuth2Handler(RequestHandler, GoogleOAuth2Mixin):
     """
     Connect with Google account
     """
+
     @coroutine
     def get(self, *args, **kwargs):
         redirect_uri = "%s://%s" % (self.request.protocol, "python-regex.com/auth/google/")
@@ -84,7 +84,7 @@ def get(self, *args, **kwargs):
                 redirect_uri=redirect_uri,
                 code=self.get_argument('code')
             )
-            
+
             access_token = str(user['access_token'])
             http_client = self.get_auth_http_client()
             response = yield http_client.fetch('https://www.googleapis.com/oauth2/v1/userinfo?access_token={}'
@@ -118,6 +118,7 @@ class TwitterOAuth2Handler(RequestHandler, TwitterMixin):
     """
     Connect with Twitter account
     """
+
     @coroutine
     def get(self, *args, **kwargs):
         if self.get_argument("oauth_token", None):
@@ -157,10 +158,12 @@ def get(self):
                 extra_params={"scope": "read_stream,offline_access"}
             )
 
+
 class LinkedInOAuth2Handler(RequestHandler, LinkedInMixin):
     """
     Connect with LinkedIn API
     """
+
     @coroutine
     def get(self, *args, **kwargs):
         config = Config()
@@ -203,11 +206,11 @@ def get(self, *args, **kwargs):
         print(user_data)
 
 
-
 class GithubOAuth2Handler(RequestHandler, GithubMixin):
     """
     Connect with GitHub API
     """
+
     @coroutine
     def get(self, *args, **kwargs):
         redirect_uri = '/auth/github/'
@@ -232,4 +235,4 @@ def get(self, *args, **kwargs):
         )
 
     def _on_login(self, user):
-       print(user)
+        print(user)

Application/App/Home/contacthandler.py

@@ -17,22 +17,21 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-import re
-
 from tornado.web import RequestHandler
-from App.utils.email import send_mail
+
+import private_settings
 from App.models.email import EmailModel
 from App.models.preference import PreferenceModel
+from App.utils.email import send_mail
 from App.utils.template import micro_template
 
-import private_settings
-
 
 class ContactHandler(RequestHandler):
     """
     Send an email via the contact form
     FIXME: This might be async
     """
+
     def post(self):
         """
         Manage post
@@ -65,5 +64,3 @@ def post(self):
                     self.write("ok")
             except Exception as e:
                 self.write("error: " + str(e))
-
-

Application/App/Home/homehandler.py

@@ -21,6 +21,7 @@
 
 from tornadoext.requesthandler import RequestHandler
 
+
 class HomeHandler(RequestHandler):
     def get(self):
         msie = re.findall(r'MSIE\s(\d+)', self.request.headers.get('user-agent'))