From 724ec1040c804c83ebd7e985c86adb40f9b2db81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=9A=D0=B0=D1=81=D0=B8?= =?UTF-8?q?=D0=BC=D0=BE=D0=B2?= Date: Mon, 15 Apr 2019 15:53:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=87=D0=B8=D1=82=D0=B0=D0=B5=D0=BC=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B8=20=D0=BA=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flatfilecms/views/pages.py | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/flatfilecms/views/pages.py b/flatfilecms/views/pages.py index 21a2d3e..d4602fb 100644 --- a/flatfilecms/views/pages.py +++ b/flatfilecms/views/pages.py @@ -1,7 +1,7 @@ from pyramid.view import ( view_config, render_view_to_response, - ) +) from pyramid.renderers import render_to_response from pyramid.httpexceptions import HTTPNotFound from pyramid.response import FileResponse @@ -9,12 +9,8 @@ from pyramid.path import (DottedNameResolver, AssetResolver) from pathlib import PurePath import yaml -from flatfilecms.models import ( - Folder, - Document, - IMarkdown, - Jinja2, - LoaderFactory) +from flatfilecms.models import (Folder, Document, IMarkdown, Jinja2, + LoaderFactory) class PagesView: @@ -31,8 +27,8 @@ class PagesView: @view_config(context=Document) def document(self): return FileResponse( - AssetResolver().resolve(self.context.path).abspath(), - request=self.request) + AssetResolver().resolve(self.context.path).abspath(), + request=self.request) @view_config(context=IMarkdown) def process_yaml(self): @@ -62,21 +58,16 @@ class PagesView: if 'menu' not in post: post['menu'] = yaml.load( AssetResolver().resolve( - str(PurePath(self.context.data_path) / + str( + PurePath(self.context.data_path) / 'menu/default.yaml')).stream(), LoaderFactory(self.context.data_path)) return render_to_response( - '{0}.jinja2'.format( - post.get('template', 'default')), - post, - request=self.request, - response=self.request.response - ) + '{0}.jinja2'.format(post.get('template', 'default')), + post, + request=self.request, + response=self.request.response) @view_config(context=Jinja2) def jinja2(self): - return render_to_response( - self.context.path, - {}, - request=self.request - ) + return render_to_response(self.context.path, {}, request=self.request)