From 60802cec8e004bdf7e9a62a75cbfd9a10978529f Mon Sep 17 00:00:00 2001 From: RemiZOffAlex Date: Fri, 26 Apr 2019 15:38:41 +0300 Subject: [PATCH] Update --- .pylintrc | 3 +++ deploy/config/__init__.py | 4 +--- deploy/config/demo.py | 4 +--- myapp/__init__.py | 11 +++++------ myapp/forms/__init__.py | 4 +--- myapp/forms/page.py | 7 +------ myapp/forms/users.py | 8 +++----- myapp/lib/__init__.py | 4 +--- myapp/lib/info.py | 9 ++++----- myapp/lib/pagination.py | 4 +--- myapp/lib/storage.py | 4 +--- myapp/models/__init__.py | 5 +---- myapp/models/users.py | 8 ++++---- myapp/ns_api/__init__.py | 5 +---- myapp/ns_api/user.py | 5 +---- myapp/ns_user/__init__.py | 5 +---- myapp/ns_user/views.py | 5 +---- myapp/views.py | 7 ++++--- run.py | 9 +++++++-- utils/useradd.py | 9 +++++---- wsgi.py | 3 +-- 21 files changed, 48 insertions(+), 75 deletions(-) create mode 100644 .pylintrc diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000..7d2f361 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,3 @@ +[MESSAGES CONTROL] + +disable=C0111, C0103, C0301 diff --git a/deploy/config/__init__.py b/deploy/config/__init__.py index cfac965..1a22168 100644 --- a/deploy/config/__init__.py +++ b/deploy/config/__init__.py @@ -1,9 +1,7 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' +__url__ = 'https://remizoffalex.ru' CONFIG = 'config.demo' diff --git a/deploy/config/demo.py b/deploy/config/demo.py index ab18f45..a8ae276 100644 --- a/deploy/config/demo.py +++ b/deploy/config/demo.py @@ -1,10 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' +__url__ = 'https://remizoffalex.ru' import os import sys diff --git a/myapp/__init__.py b/myapp/__init__.py index ff32a3b..92a5bf3 100644 --- a/myapp/__init__.py +++ b/myapp/__init__.py @@ -1,11 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' -__url__ = 'http://remizoffalex.ru' +__url__ = 'https://remizoffalex.ru' import config import logging @@ -19,9 +16,11 @@ app.config.from_object(config.CONFIG) app.config.from_envvar('FLASKR_SETTINGS', silent=True) # Логирование -handler = RotatingFileHandler(app.config['LOG_FILE'], +handler = RotatingFileHandler( + app.config['LOG_FILE'], maxBytes=app.config['LOG_FILE_SIZE']*1024*1024, - backupCount=1) + backupCount=1 +) handler.setLevel(logging.INFO) formatter = logging.Formatter(app.config['LONG_LOG_FORMAT']) handler.setFormatter(formatter) diff --git a/myapp/forms/__init__.py b/myapp/forms/__init__.py index 2fb73c6..808d328 100644 --- a/myapp/forms/__init__.py +++ b/myapp/forms/__init__.py @@ -1,10 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' +__url__ = 'https://remizoffalex.ru' from .users import LoginForm from .page import PageEdit diff --git a/myapp/forms/page.py b/myapp/forms/page.py index de7a886..2dbfd35 100644 --- a/myapp/forms/page.py +++ b/myapp/forms/page.py @@ -1,17 +1,12 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' -__url__ = 'http://remizoffalex.ru' +__url__ = 'https://remizoffalex.ru' from wtforms import ( Form, - BooleanField, TextField, - PasswordField, TextAreaField ) diff --git a/myapp/forms/users.py b/myapp/forms/users.py index 8f836c9..ed9d3a0 100644 --- a/myapp/forms/users.py +++ b/myapp/forms/users.py @@ -1,13 +1,11 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' -__url__ = 'http://remizoffalex.ru' +__url__ = 'https://remizoffalex.ru' + +from wtforms import Form, TextField, PasswordField -from wtforms import Form, BooleanField, TextField, PasswordField class LoginForm(Form): username = TextField('Имя пользователя') diff --git a/myapp/lib/__init__.py b/myapp/lib/__init__.py index 8c31b62..74c009c 100644 --- a/myapp/lib/__init__.py +++ b/myapp/lib/__init__.py @@ -1,10 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' +__url__ = 'https://remizoffalex.ru' from .pagination import Pagination, getpage from .passwd import pwgen, get_hash_password diff --git a/myapp/lib/info.py b/myapp/lib/info.py index ef36cd8..d4dc207 100644 --- a/myapp/lib/info.py +++ b/myapp/lib/info.py @@ -1,17 +1,16 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' -__url__ = 'http://remizoffalex.ru' +__url__ = 'https://remizoffalex.ru' from flask import session, request from .. import app, models def get_user(): - """Получить текущего пользователя""" + """ + Получить текущего пользователя + """ result = None if 'user_id' in session: result = models.db_session.query( diff --git a/myapp/lib/pagination.py b/myapp/lib/pagination.py index c6aba5c..c4bfabe 100644 --- a/myapp/lib/pagination.py +++ b/myapp/lib/pagination.py @@ -1,10 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' +__url__ = 'https://remizoffalex.ru' from math import ceil diff --git a/myapp/lib/storage.py b/myapp/lib/storage.py index dba4c2a..2fdf234 100644 --- a/myapp/lib/storage.py +++ b/myapp/lib/storage.py @@ -1,10 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' +__url__ = 'https://remizoffalex.ru' def gettree(number, count=3): """ diff --git a/myapp/models/__init__.py b/myapp/models/__init__.py index e8d596d..dfdc8ff 100644 --- a/myapp/models/__init__.py +++ b/myapp/models/__init__.py @@ -1,11 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' -__url__ = 'http://remizoffalex.ru' +__url__ = 'https://remizoffalex.ru' from sqlalchemy import create_engine from sqlalchemy.orm import scoped_session, sessionmaker diff --git a/myapp/models/users.py b/myapp/models/users.py index f4f804a..abc35bf 100644 --- a/myapp/models/users.py +++ b/myapp/models/users.py @@ -1,11 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' -__url__ = 'http://remizoffalex.ru' +__url__ = 'https://remizoffalex.ru' import datetime from sqlalchemy import ( @@ -23,6 +20,9 @@ from . import Base class User(Base): + """ + Пользователи + """ __tablename__ = "user" id = Column(Integer, primary_key=True) diff --git a/myapp/ns_api/__init__.py b/myapp/ns_api/__init__.py index 175c58e..c8fbf6e 100644 --- a/myapp/ns_api/__init__.py +++ b/myapp/ns_api/__init__.py @@ -1,11 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' -__url__ = 'http://remizoffalex.ru' +__url__ = 'https://remizoffalex.ru' from flask_jsonrpc import JSONRPC diff --git a/myapp/ns_api/user.py b/myapp/ns_api/user.py index 7ede814..25e1c6d 100644 --- a/myapp/ns_api/user.py +++ b/myapp/ns_api/user.py @@ -1,11 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' -__url__ = 'http://remizoffalex.ru' +__url__ = 'https://remizoffalex.ru' from flask import abort, escape diff --git a/myapp/ns_user/__init__.py b/myapp/ns_user/__init__.py index ea8e6a1..98efb65 100644 --- a/myapp/ns_user/__init__.py +++ b/myapp/ns_user/__init__.py @@ -1,11 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' -__url__ = 'http://remizoffalex.ru' +__url__ = 'https://remizoffalex.ru' import os import jinja2 diff --git a/myapp/ns_user/views.py b/myapp/ns_user/views.py index e8921ac..174e56c 100644 --- a/myapp/ns_user/views.py +++ b/myapp/ns_user/views.py @@ -1,11 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' -__url__ = 'http://remizoffalex.ru' +__url__ = 'https://remizoffalex.ru' from flask import render_template diff --git a/myapp/views.py b/myapp/views.py index 224914e..daa502e 100644 --- a/myapp/views.py +++ b/myapp/views.py @@ -1,10 +1,8 @@ -#!/usr/bin/env python3 -# -*- coding: UTF-8 -*- - __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' +__url__ = 'https://remizoffalex.ru' from myapp import app from flask import Flask, render_template, request @@ -45,6 +43,9 @@ def edit(): @app.route('/login', methods=['GET', 'POST']) def login(): + """ + Логин + """ pagedata = {} pagedata['form'] = forms.LoginForm(request.form) body = render_template('login.html', pagedata=pagedata) diff --git a/run.py b/run.py index b1578d7..ac1d260 100755 --- a/run.py +++ b/run.py @@ -1,6 +1,11 @@ #!/usr/bin/env python3 -# -*- coding: UTF-8 -*- + +__author__ = 'RemiZOffAlex' +__copyright__ = '(c) RemiZOffAlex' +__license__ = 'MIT' +__email__ = 'remizoffalex@mail.ru' +__url__ = 'https://remizoffalex.ru' from myapp import app as application -application.run(debug = True, host= '0.0.0.0', port=8000) +application.run(debug=True, host='0.0.0.0', port=8000) diff --git a/utils/useradd.py b/utils/useradd.py index c6c092f..8fc05c7 100755 --- a/utils/useradd.py +++ b/utils/useradd.py @@ -1,11 +1,10 @@ #!/usr/bin/env python3 -# -*- coding: UTF-8 -*- __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' -__url__ = 'http://remizoffalex.ru' +__url__ = 'https://remizoffalex.ru' import os import sys @@ -18,8 +17,10 @@ from myapp import app, lib, models def main(): - parser = argparse.ArgumentParser(description='Скрипт добавления пользователя', - formatter_class=argparse.ArgumentDefaultsHelpFormatter) + parser = argparse.ArgumentParser( + description='Скрипт добавления пользователя', + formatter_class=argparse.ArgumentDefaultsHelpFormatter + ) parser._optionals.title = "Необязательные аргументы" parser.add_argument("--user", dest="user", required=True, help="Новый пользователь") diff --git a/wsgi.py b/wsgi.py index e3d39aa..4b84e7e 100755 --- a/wsgi.py +++ b/wsgi.py @@ -1,10 +1,9 @@ #!/usr/bin/env python3 -# -*- coding: UTF-8 -*- __author__ = 'RemiZOffAlex' __copyright__ = '(c) RemiZOffAlex' __license__ = 'MIT' __email__ = 'remizoffalex@mail.ru' -__url__ = 'http://remizoffalex.ru' +__url__ = 'https://remizoffalex.ru' from myapp import app as application