From 9e17f552f1d3643a49a9f37dca90e56aab03869d Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sat, 29 Dec 2012 20:27:52 +0100 Subject: [PATCH 01/17] Move comments in settings.py to docstring --- docs/source/plugin-api.rst | 5 ++ jedi/settings.py | 129 ++++++++++++++++++++++++------------- 2 files changed, 89 insertions(+), 45 deletions(-) diff --git a/docs/source/plugin-api.rst b/docs/source/plugin-api.rst index 58d42994..eb8b1d71 100644 --- a/docs/source/plugin-api.rst +++ b/docs/source/plugin-api.rst @@ -25,6 +25,11 @@ API Return Classes .. automodule:: api_classes :undoc-members: +Jedi setting interface +~~~~~~~~~~~~~~~~~~~~~~ + +.. automodule:: settings + Examples -------- diff --git a/jedi/settings.py b/jedi/settings.py index b976d866..8c5c7bd8 100644 --- a/jedi/settings.py +++ b/jedi/settings.py @@ -2,58 +2,84 @@ # completion output settings # ---------------- -# The completion is by default case insensitive. case_insensitive_completion = True +""" +The completion is by default case insensitive. +""" -# Adds a dot after a module, because a module that is not accessed this way is -# definitely not the normal case. However, in VIM this doesn't work, that's why -# it isn't used at the moment. add_dot_after_module = False +""" +Adds a dot after a module, because a module that is not accessed this way is +definitely not the normal case. However, in VIM this doesn't work, that's why +it isn't used at the moment. +""" -# Adds an opening bracket after a function, because that's normal behaviour. -# Removed it again, because in VIM that is not very practical. add_bracket_after_function = False +""" +Adds an opening bracket after a function, because that's normal behaviour. +Removed it again, because in VIM that is not very practical. +""" -# If set, completions with the same name don't appear in the output anymore, -# but are in the `same_name_completions` attribute. no_completion_duplicates = True +""" +If set, completions with the same name don't appear in the output anymore, +but are in the `same_name_completions` attribute. +""" # ---------------- # parser # ---------------- -# Use the fast parser. This means that reparsing is only being done if -# something has been changed e.g. to a function. If this happens, only the -# function is being reparsed. fast_parser = True +""" +Use the fast parser. This means that reparsing is only being done if +something has been changed e.g. to a function. If this happens, only the +function is being reparsed. +""" -# This is just a debugging option. Always reparsing means that the fast parser -# is basically useless. So don't use it. fast_parser_always_reparse = False +""" +This is just a debugging option. Always reparsing means that the fast parser +is basically useless. So don't use it. +""" -# Use the cache (full cache) to generate get_in_function_call's. This may fail -# with multiline docstrings (likely) and other complicated changes (unlikely). -# The goal is to move away from it by making the rest faster. use_get_in_function_call_cache = True +""" +Use the cache (full cache) to generate get_in_function_call's. This may fail +with multiline docstrings (likely) and other complicated changes (unlikely). +The goal is to move away from it by making the rest faster. +""" # ---------------- # dynamic stuff # ---------------- -# check for `append`, etc. on array instances like list() dynamic_arrays_instances = True -# check for `append`, etc. on arrays: [], {}, () +""" +check for `append`, etc. on array instances like list() +""" + dynamic_array_additions = True +""" +check for `append`, etc. on arrays: [], {}, () +""" -# A dynamic param completion, finds the callees of the function, which define -# the params of a function. dynamic_params = True -# Do the same for other modules. -dynamic_params_for_other_modules = True +""" +A dynamic param completion, finds the callees of the function, which define +the params of a function. +""" + +dynamic_params_for_other_modules = True +""" +Do the same for other modules. +""" -# Additional modules in which Jedi checks if statements are to be found. This -# is practical for IDE's, that want to administrate their modules themselves. additional_dynamic_modules = [] +""" +Additional modules in which Jedi checks if statements are to be found. This +is practical for IDE's, that want to administrate their modules themselves. +""" # ---------------- # recursions @@ -64,49 +90,62 @@ additional_dynamic_modules = [] # `max_executions`. This limit is important, to set a maximum amount of time, # the completion may use. # -# The `max_until_execution_unique` limit is probably the most important one, -# because if that limit is passed, functions can only be one time executed. So -# new functions will be executed, complex recursions with the same functions -# again and again, are ignored. -# -# `max_function_recursion_level` is more about whether the recursions are -# stopped in deepth or in width. The ratio beetween this and -# `max_until_execution_unique` is important here. It stops a recursion (after -# the number of function calls in the recursion), if it was already used -# earlier. -# # The values are based on my experimental tries, used on the jedi library. But # I don't think there's any other Python library, that uses recursion in a # similar (extreme) way. This makes the completion definitely worse in some # cases. But a completion should also be fast. -max_function_recursion_level = 5 max_until_execution_unique = 50 +""" +The `max_until_execution_unique` limit is probably the most important one, +because if that limit is passed, functions can only be one time executed. So +new functions will be executed, complex recursions with the same functions +again and again, are ignored. +""" + +max_function_recursion_level = 5 +""" +`max_function_recursion_level` is more about whether the recursions are +stopped in deepth or in width. The ratio beetween this and +`max_until_execution_unique` is important here. It stops a recursion (after +the number of function calls in the recursion), if it was already used +earlier. +""" + max_executions_without_builtins = 200 + max_executions = 250 -# Because get_in_function_call is normally used on every single key hit, it has -# to be faster than a normal completion. This is the factor that is used to -# scale `max_executions` and `max_until_execution_unique`: scale_get_in_function_call = 0.1 +""" +Because get_in_function_call is normally used on every single key hit, it has +to be faster than a normal completion. This is the factor that is used to +scale `max_executions` and `max_until_execution_unique`: +""" # ---------------- # various # ---------------- -# Size of the current code part, which is used to speed up parsing. part_line_length = 20 +""" +Size of the current code part, which is used to speed up parsing. +""" # ---------------- # caching validity (time) # ---------------- -# In huge packages like numpy, checking all star imports on every completion -# might be slow, therefore we do a star import caching, that lasts a certain -# time span (in seconds). star_import_cache_validity = 60.0 +""" +In huge packages like numpy, checking all star imports on every completion +might be slow, therefore we do a star import caching, that lasts a certain +time span (in seconds). +""" -# Finding function calls might be slow (0.1-0.5s). This is not acceptible for -# normal writing. Therefore cache it for a short time. get_in_function_call_validity = 3.0 +""" +Finding function calls might be slow (0.1-0.5s). This is not acceptible for +normal writing. Therefore cache it for a short time. +""" From 0747469ffcd35815e5148d0c9c47285c0e71408b Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sat, 29 Dec 2012 20:28:57 +0100 Subject: [PATCH 02/17] Use autodoc_member_order = 'bysource' This is for making the variables appear in settings.py to appear in the document in the same order. --- docs/source/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/conf.py b/docs/source/conf.py index 13529c36..44b6f95a 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -256,4 +256,5 @@ todo_include_todos = False # -- Options for autodoc module ------------------------------------------------ +autodoc_member_order = 'bysource' autodoc_default_flags = ['members', 'undoc-members'] From c11a4fc050e0a866d5f57a30678b7b217422bd1d Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sat, 29 Dec 2012 20:36:29 +0100 Subject: [PATCH 03/17] Add top level docstring to settings.py --- jedi/settings.py | 61 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/jedi/settings.py b/jedi/settings.py index 8c5c7bd8..197d46b5 100644 --- a/jedi/settings.py +++ b/jedi/settings.py @@ -1,3 +1,54 @@ +""" +* Completion output settings + + - :data:`case_insensitive_completion` + - :data:`add_dot_after_module` + - :data:`add_bracket_after_function` + - :data:`no_completion_duplicates` + +* Parser + + - :data:`fast_parser` + - :data:`fast_parser_always_reparse` + - :data:`use_get_in_function_call_cache` + +* Dynamic stuff + + - :data:`dynamic_arrays_instances` + - :data:`dynamic_array_additions` + - :data:`dynamic_params` + - :data:`dynamic_params_for_other_modules` + - :data:`additional_dynamic_modules` + +* Recursions + + Recursion settings are important if you don't want extremly + recursive python code to go absolutely crazy. First of there is a + global limit :data:`max_executions`. This limit is important, to set + a maximum amount of time, the completion may use. + + The values are based on my experimental tries, used on the jedi library. But + I don't think there's any other Python library, that uses recursion in a + similar (extreme) way. This makes the completion definitely worse in some + cases. But a completion should also be fast. + + - :data:`max_until_execution_unique` + - :data:`max_function_recursion_level` + - :data:`max_executions_without_builtins` + - :data:`max_executions` + - :data:`scale_get_in_function_call` + +* Various + + - :data:`part_line_length` + +* Caching validity (time) + + - :data:`star_import_cache_validity` + - :data:`get_in_function_call_validity` + +""" + # ---------------- # completion output settings # ---------------- @@ -85,16 +136,6 @@ is practical for IDE's, that want to administrate their modules themselves. # recursions # ---------------- -# Recursion settings are important if you don't want extremly recursive python -# code to go absolutely crazy. First of there is a global limit -# `max_executions`. This limit is important, to set a maximum amount of time, -# the completion may use. -# -# The values are based on my experimental tries, used on the jedi library. But -# I don't think there's any other Python library, that uses recursion in a -# similar (extreme) way. This makes the completion definitely worse in some -# cases. But a completion should also be fast. - max_until_execution_unique = 50 """ The `max_until_execution_unique` limit is probably the most important one, From 51b22e0cb50908071b19dd770fbf82129a7e6d83 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sat, 29 Dec 2012 20:39:08 +0100 Subject: [PATCH 04/17] Add docstrings to all variables in settings.py --- jedi/settings.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jedi/settings.py b/jedi/settings.py index 197d46b5..bee03669 100644 --- a/jedi/settings.py +++ b/jedi/settings.py @@ -154,8 +154,14 @@ earlier. """ max_executions_without_builtins = 200 +""" +.. todo:: Document this. +""" max_executions = 250 +""" +A maximum amount of time, the completion may use. +""" scale_get_in_function_call = 0.1 """ From d89f469e12b070d7d62944db89021a0aa3887a88 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sat, 29 Dec 2012 20:48:46 +0100 Subject: [PATCH 05/17] Add intro part in settings.py --- jedi/settings.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jedi/settings.py b/jedi/settings.py index bee03669..d4c4716c 100644 --- a/jedi/settings.py +++ b/jedi/settings.py @@ -1,4 +1,13 @@ """ +Variables to hold global jedi setting. + +Plugin can change the variables defined in :mod:`jedi.settings` to +modify behavior of Jedi. Plugin should expose an interface to setup +these variables by user. Example usage:: + + from jedi import settings + settings.case_insensitive_completion = True + * Completion output settings - :data:`case_insensitive_completion` From 7210751584606bfbcf6ef8793dd8938f983e6813 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Sun, 30 Dec 2012 00:29:08 +0100 Subject: [PATCH 06/17] Switched to flask theme --- docs/source/_themes/flask/LICENSE | 37 ++ docs/source/_themes/flask/layout.html | 25 ++ docs/source/_themes/flask/relations.html | 19 + docs/source/_themes/flask/static/flasky.css_t | 395 ++++++++++++++++++ .../_themes/flask/static/small_flask.css | 70 ++++ docs/source/_themes/flask/theme.conf | 9 + docs/source/_themes/flask_theme_support.py | 125 ++++++ docs/source/conf.py | 7 +- 8 files changed, 684 insertions(+), 3 deletions(-) create mode 100644 docs/source/_themes/flask/LICENSE create mode 100644 docs/source/_themes/flask/layout.html create mode 100644 docs/source/_themes/flask/relations.html create mode 100644 docs/source/_themes/flask/static/flasky.css_t create mode 100644 docs/source/_themes/flask/static/small_flask.css create mode 100644 docs/source/_themes/flask/theme.conf create mode 100644 docs/source/_themes/flask_theme_support.py diff --git a/docs/source/_themes/flask/LICENSE b/docs/source/_themes/flask/LICENSE new file mode 100644 index 00000000..8daab7ee --- /dev/null +++ b/docs/source/_themes/flask/LICENSE @@ -0,0 +1,37 @@ +Copyright (c) 2010 by Armin Ronacher. + +Some rights reserved. + +Redistribution and use in source and binary forms of the theme, with or +without modification, are permitted provided that the following conditions +are met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + +* The names of the contributors may not be used to endorse or + promote products derived from this software without specific + prior written permission. + +We kindly ask you to only use these themes in an unmodified manner just +for Flask and Flask-related products, not for unrelated projects. If you +like the visual style and want to use it for your own projects, please +consider making some larger changes to the themes (such as changing +font faces, sizes, colors or margins). + +THIS THEME IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS THEME, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/docs/source/_themes/flask/layout.html b/docs/source/_themes/flask/layout.html new file mode 100644 index 00000000..5caa4e29 --- /dev/null +++ b/docs/source/_themes/flask/layout.html @@ -0,0 +1,25 @@ +{%- extends "basic/layout.html" %} +{%- block extrahead %} + {{ super() }} + {% if theme_touch_icon %} + + {% endif %} + +{% endblock %} +{%- block relbar2 %}{% endblock %} +{% block header %} + {{ super() }} + {% if pagename == 'index' %} +
+ {% endif %} +{% endblock %} +{%- block footer %} +
+ © Copyright {{ copyright }}. + Created using Sphinx. +
+ {% if pagename == 'index' %} +
+ {% endif %} +{%- endblock %} diff --git a/docs/source/_themes/flask/relations.html b/docs/source/_themes/flask/relations.html new file mode 100644 index 00000000..3bbcde85 --- /dev/null +++ b/docs/source/_themes/flask/relations.html @@ -0,0 +1,19 @@ +

Related Topics

+ diff --git a/docs/source/_themes/flask/static/flasky.css_t b/docs/source/_themes/flask/static/flasky.css_t new file mode 100644 index 00000000..b5ca39bc --- /dev/null +++ b/docs/source/_themes/flask/static/flasky.css_t @@ -0,0 +1,395 @@ +/* + * flasky.css_t + * ~~~~~~~~~~~~ + * + * :copyright: Copyright 2010 by Armin Ronacher. + * :license: Flask Design License, see LICENSE for details. + */ + +{% set page_width = '940px' %} +{% set sidebar_width = '220px' %} + +@import url("basic.css"); + +/* -- page layout ----------------------------------------------------------- */ + +body { + font-family: 'Georgia', serif; + font-size: 17px; + background-color: white; + color: #000; + margin: 0; + padding: 0; +} + +div.document { + width: {{ page_width }}; + margin: 30px auto 0 auto; +} + +div.documentwrapper { + float: left; + width: 100%; +} + +div.bodywrapper { + margin: 0 0 0 {{ sidebar_width }}; +} + +div.sphinxsidebar { + width: {{ sidebar_width }}; +} + +hr { + border: 1px solid #B1B4B6; +} + +div.body { + background-color: #ffffff; + color: #3E4349; + padding: 0 30px 0 30px; +} + +img.floatingflask { + padding: 0 0 10px 10px; + float: right; +} + +div.footer { + width: {{ page_width }}; + margin: 20px auto 30px auto; + font-size: 14px; + color: #888; + text-align: right; +} + +div.footer a { + color: #888; +} + +div.related { + display: none; +} + +div.sphinxsidebar a { + color: #444; + text-decoration: none; + border-bottom: 1px dotted #999; +} + +div.sphinxsidebar a:hover { + border-bottom: 1px solid #999; +} + +div.sphinxsidebar { + font-size: 14px; + line-height: 1.5; +} + +div.sphinxsidebarwrapper { + padding: 18px 10px; +} + +div.sphinxsidebarwrapper p.logo { + padding: 0 0 20px 0; + margin: 0; + text-align: center; +} + +div.sphinxsidebar h3, +div.sphinxsidebar h4 { + font-family: 'Garamond', 'Georgia', serif; + color: #444; + font-size: 24px; + font-weight: normal; + margin: 0 0 5px 0; + padding: 0; +} + +div.sphinxsidebar h4 { + font-size: 20px; +} + +div.sphinxsidebar h3 a { + color: #444; +} + +div.sphinxsidebar p.logo a, +div.sphinxsidebar h3 a, +div.sphinxsidebar p.logo a:hover, +div.sphinxsidebar h3 a:hover { + border: none; +} + +div.sphinxsidebar p { + color: #555; + margin: 10px 0; +} + +div.sphinxsidebar ul { + margin: 10px 0; + padding: 0; + color: #000; +} + +div.sphinxsidebar input { + border: 1px solid #ccc; + font-family: 'Georgia', serif; + font-size: 1em; +} + +/* -- body styles ----------------------------------------------------------- */ + +a { + color: #004B6B; + text-decoration: underline; +} + +a:hover { + color: #6D4100; + text-decoration: underline; +} + +div.body h1, +div.body h2, +div.body h3, +div.body h4, +div.body h5, +div.body h6 { + font-family: 'Garamond', 'Georgia', serif; + font-weight: normal; + margin: 30px 0px 10px 0px; + padding: 0; +} + +{% if theme_index_logo %} +div.indexwrapper h1 { + text-indent: -999999px; + background: url({{ theme_index_logo }}) no-repeat center center; + height: {{ theme_index_logo_height }}; +} +{% endif %} + +div.body h1 { margin-top: 0; padding-top: 0; font-size: 240%; } +div.body h2 { font-size: 180%; } +div.body h3 { font-size: 150%; } +div.body h4 { font-size: 130%; } +div.body h5 { font-size: 100%; } +div.body h6 { font-size: 100%; } + +a.headerlink { + color: #ddd; + padding: 0 4px; + text-decoration: none; +} + +a.headerlink:hover { + color: #444; + background: #eaeaea; +} + +div.body p, div.body dd, div.body li { + line-height: 1.4em; +} + +div.admonition { + background: #fafafa; + margin: 20px -30px; + padding: 10px 30px; + border-top: 1px solid #ccc; + border-bottom: 1px solid #ccc; +} + +div.admonition tt.xref, div.admonition a tt { + border-bottom: 1px solid #fafafa; +} + +dd div.admonition { + margin-left: -60px; + padding-left: 60px; +} + +div.admonition p.admonition-title { + font-family: 'Garamond', 'Georgia', serif; + font-weight: normal; + font-size: 24px; + margin: 0 0 10px 0; + padding: 0; + line-height: 1; +} + +div.admonition p.last { + margin-bottom: 0; +} + +div.highlight { + background-color: white; +} + +dt:target, .highlight { + background: #FAF3E8; +} + +div.note { + background-color: #eee; + border: 1px solid #ccc; +} + +div.seealso { + background-color: #ffc; + border: 1px solid #ff6; +} + +div.topic { + background-color: #eee; +} + +p.admonition-title { + display: inline; +} + +p.admonition-title:after { + content: ":"; +} + +pre, tt { + font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace; + font-size: 0.9em; +} + +img.screenshot { +} + +tt.descname, tt.descclassname { + font-size: 0.95em; +} + +tt.descname { + padding-right: 0.08em; +} + +img.screenshot { + -moz-box-shadow: 2px 2px 4px #eee; + -webkit-box-shadow: 2px 2px 4px #eee; + box-shadow: 2px 2px 4px #eee; +} + +table.docutils { + border: 1px solid #888; + -moz-box-shadow: 2px 2px 4px #eee; + -webkit-box-shadow: 2px 2px 4px #eee; + box-shadow: 2px 2px 4px #eee; +} + +table.docutils td, table.docutils th { + border: 1px solid #888; + padding: 0.25em 0.7em; +} + +table.field-list, table.footnote { + border: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +table.footnote { + margin: 15px 0; + width: 100%; + border: 1px solid #eee; + background: #fdfdfd; + font-size: 0.9em; +} + +table.footnote + table.footnote { + margin-top: -15px; + border-top: none; +} + +table.field-list th { + padding: 0 0.8em 0 0; +} + +table.field-list td { + padding: 0; +} + +table.footnote td.label { + width: 0px; + padding: 0.3em 0 0.3em 0.5em; +} + +table.footnote td { + padding: 0.3em 0.5em; +} + +dl { + margin: 0; + padding: 0; +} + +dl dd { + margin-left: 30px; +} + +blockquote { + margin: 0 0 0 30px; + padding: 0; +} + +ul, ol { + margin: 10px 0 10px 30px; + padding: 0; +} + +pre { + background: #eee; + padding: 7px 30px; + margin: 15px -30px; + line-height: 1.3em; +} + +dl pre, blockquote pre, li pre { + margin-left: -60px; + padding-left: 60px; +} + +dl dl pre { + margin-left: -90px; + padding-left: 90px; +} + +tt { + background-color: #ecf0f3; + color: #222; + /* padding: 1px 2px; */ +} + +tt.xref, a tt { + background-color: #FBFBFB; + border-bottom: 1px solid white; +} + +a.reference { + text-decoration: none; + border-bottom: 1px dotted #004B6B; +} + +a.reference:hover { + border-bottom: 1px solid #6D4100; +} + +a.footnote-reference { + text-decoration: none; + font-size: 0.7em; + vertical-align: top; + border-bottom: 1px dotted #004B6B; +} + +a.footnote-reference:hover { + border-bottom: 1px solid #6D4100; +} + +a:hover tt { + background: #EEE; +} diff --git a/docs/source/_themes/flask/static/small_flask.css b/docs/source/_themes/flask/static/small_flask.css new file mode 100644 index 00000000..1c6df309 --- /dev/null +++ b/docs/source/_themes/flask/static/small_flask.css @@ -0,0 +1,70 @@ +/* + * small_flask.css_t + * ~~~~~~~~~~~~~~~~~ + * + * :copyright: Copyright 2010 by Armin Ronacher. + * :license: Flask Design License, see LICENSE for details. + */ + +body { + margin: 0; + padding: 20px 30px; +} + +div.documentwrapper { + float: none; + background: white; +} + +div.sphinxsidebar { + display: block; + float: none; + width: 102.5%; + margin: 50px -30px -20px -30px; + padding: 10px 20px; + background: #333; + color: white; +} + +div.sphinxsidebar h3, div.sphinxsidebar h4, div.sphinxsidebar p, +div.sphinxsidebar h3 a { + color: white; +} + +div.sphinxsidebar a { + color: #aaa; +} + +div.sphinxsidebar p.logo { + display: none; +} + +div.document { + width: 100%; + margin: 0; +} + +div.related { + display: block; + margin: 0; + padding: 10px 0 20px 0; +} + +div.related ul, +div.related ul li { + margin: 0; + padding: 0; +} + +div.footer { + display: none; +} + +div.bodywrapper { + margin: 0; +} + +div.body { + min-height: 0; + padding: 0; +} diff --git a/docs/source/_themes/flask/theme.conf b/docs/source/_themes/flask/theme.conf new file mode 100644 index 00000000..18c720f8 --- /dev/null +++ b/docs/source/_themes/flask/theme.conf @@ -0,0 +1,9 @@ +[theme] +inherit = basic +stylesheet = flasky.css +pygments_style = flask_theme_support.FlaskyStyle + +[options] +index_logo = '' +index_logo_height = 120px +touch_icon = diff --git a/docs/source/_themes/flask_theme_support.py b/docs/source/_themes/flask_theme_support.py new file mode 100644 index 00000000..d3e33c06 --- /dev/null +++ b/docs/source/_themes/flask_theme_support.py @@ -0,0 +1,125 @@ +""" +Copyright (c) 2010 by Armin Ronacher. + +Some rights reserved. + +Redistribution and use in source and binary forms of the theme, with or +without modification, are permitted provided that the following conditions +are met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + +* The names of the contributors may not be used to endorse or + promote products derived from this software without specific + prior written permission. + +We kindly ask you to only use these themes in an unmodified manner just +for Flask and Flask-related products, not for unrelated projects. If you +like the visual style and want to use it for your own projects, please +consider making some larger changes to the themes (such as changing +font faces, sizes, colors or margins). + +THIS THEME IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS THEME, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +""" +# flasky extensions. flasky pygments style based on tango style +from pygments.style import Style +from pygments.token import Keyword, Name, Comment, String, Error, \ + Number, Operator, Generic, Whitespace, Punctuation, Other, Literal + + +class FlaskyStyle(Style): + background_color = "#f8f8f8" + default_style = "" + + styles = { + # No corresponding class for the following: + #Text: "", # class: '' + Whitespace: "underline #f8f8f8", # class: 'w' + Error: "#a40000 border:#ef2929", # class: 'err' + Other: "#000000", # class 'x' + + Comment: "italic #8f5902", # class: 'c' + Comment.Preproc: "noitalic", # class: 'cp' + + Keyword: "bold #004461", # class: 'k' + Keyword.Constant: "bold #004461", # class: 'kc' + Keyword.Declaration: "bold #004461", # class: 'kd' + Keyword.Namespace: "bold #004461", # class: 'kn' + Keyword.Pseudo: "bold #004461", # class: 'kp' + Keyword.Reserved: "bold #004461", # class: 'kr' + Keyword.Type: "bold #004461", # class: 'kt' + + Operator: "#582800", # class: 'o' + Operator.Word: "bold #004461", # class: 'ow' - like keywords + + Punctuation: "bold #000000", # class: 'p' + + # because special names such as Name.Class, Name.Function, etc. + # are not recognized as such later in the parsing, we choose them + # to look the same as ordinary variables. + Name: "#000000", # class: 'n' + Name.Attribute: "#c4a000", # class: 'na' - to be revised + Name.Builtin: "#004461", # class: 'nb' + Name.Builtin.Pseudo: "#3465a4", # class: 'bp' + Name.Class: "#000000", # class: 'nc' - to be revised + Name.Constant: "#000000", # class: 'no' - to be revised + Name.Decorator: "#888", # class: 'nd' - to be revised + Name.Entity: "#ce5c00", # class: 'ni' + Name.Exception: "bold #cc0000", # class: 'ne' + Name.Function: "#000000", # class: 'nf' + Name.Property: "#000000", # class: 'py' + Name.Label: "#f57900", # class: 'nl' + Name.Namespace: "#000000", # class: 'nn' - to be revised + Name.Other: "#000000", # class: 'nx' + Name.Tag: "bold #004461", # class: 'nt' - like a keyword + Name.Variable: "#000000", # class: 'nv' - to be revised + Name.Variable.Class: "#000000", # class: 'vc' - to be revised + Name.Variable.Global: "#000000", # class: 'vg' - to be revised + Name.Variable.Instance: "#000000", # class: 'vi' - to be revised + + Number: "#990000", # class: 'm' + + Literal: "#000000", # class: 'l' + Literal.Date: "#000000", # class: 'ld' + + String: "#4e9a06", # class: 's' + String.Backtick: "#4e9a06", # class: 'sb' + String.Char: "#4e9a06", # class: 'sc' + String.Doc: "italic #8f5902", # class: 'sd' - like a comment + String.Double: "#4e9a06", # class: 's2' + String.Escape: "#4e9a06", # class: 'se' + String.Heredoc: "#4e9a06", # class: 'sh' + String.Interpol: "#4e9a06", # class: 'si' + String.Other: "#4e9a06", # class: 'sx' + String.Regex: "#4e9a06", # class: 'sr' + String.Single: "#4e9a06", # class: 's1' + String.Symbol: "#4e9a06", # class: 'ss' + + Generic: "#000000", # class: 'g' + Generic.Deleted: "#a40000", # class: 'gd' + Generic.Emph: "italic #000000", # class: 'ge' + Generic.Error: "#ef2929", # class: 'gr' + Generic.Heading: "bold #000080", # class: 'gh' + Generic.Inserted: "#00A000", # class: 'gi' + Generic.Output: "#888", # class: 'go' + Generic.Prompt: "#745334", # class: 'gp' + Generic.Strong: "bold #000000", # class: 'gs' + Generic.Subheading: "bold #800080", # class: 'gu' + Generic.Traceback: "bold #a40000", # class: 'gt' + } diff --git a/docs/source/conf.py b/docs/source/conf.py index 44b6f95a..2cdee631 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -18,6 +18,7 @@ import sys, os # documentation root, use os.path.abspath to make it absolute, like shown here. sys.path.insert(0, os.path.abspath('../..')) sys.path.insert(0, os.path.abspath('../../jedi')) +sys.path.append(os.path.abspath('_themes')) # -- General configuration ----------------------------------------------------- @@ -98,7 +99,7 @@ pygments_style = 'sphinx' # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' +html_theme = 'flask' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the @@ -106,7 +107,7 @@ html_theme = 'default' #html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] +html_theme_path = ['_themes'] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". @@ -173,7 +174,7 @@ html_static_path = ['_static'] # Output file base name for HTML help builder. htmlhelp_basename = 'Jedidoc' -html_style = '/default.css' # Force usage of default template on RTD +#html_style = 'default.css' # Force usage of default template on RTD # -- Options for LaTeX output -------------------------------------------------- From d3e4ea4d2a74dbd51324d645fb053038dd48b63a Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Sun, 30 Dec 2012 01:03:56 +0100 Subject: [PATCH 07/17] Added logo to docs --- docs/source/_static/logo.png | Bin 0 -> 21786 bytes docs/source/_templates/sidebarlogo.html | 3 +++ docs/source/_themes/flask/theme.conf | 2 +- docs/source/conf.py | 5 ++++- 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 docs/source/_static/logo.png create mode 100644 docs/source/_templates/sidebarlogo.html diff --git a/docs/source/_static/logo.png b/docs/source/_static/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f56374e3ddf5d43870f985d1db32eeabd9054570 GIT binary patch literal 21786 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