Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: update v8_inspector #7118

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions deps/v8_inspector/deps/jinja2/LICENSE
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
Copyright (c) 2009 by the Jinja Team, see AUTHORS for more details.

Some rights reserved.

Redistribution and use in source and binary forms, 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.

THIS SOFTWARE 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copyright (c) 2009 by the Jinja Team, see AUTHORS for more details.
Some rights reserved.
Redistribution and use in source and binary forms, 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.
THIS SOFTWARE 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copy link
Member

@bnoordhuis bnoordhuis Jun 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you undo the LF -> CRLF changes in this file?

EDIT: Or does this come verbatim from upstream?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This did come verbatim from upstream. The difference shows up, as you guessed, because we land with --whitespace=fix

50 changes: 25 additions & 25 deletions deps/v8_inspector/deps/jinja2/docs/_themes/jinja/static/jinja.css_t
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
{% set sidebar_width = '220px' %}
{% set font_family = 'Georgia, serif' %}
{% set header_font_family = 'Crimson Text, ' ~ font_family %}

@import url("basic.css");

/* -- page layout ----------------------------------------------------------- */

body {
font-family: {{ font_family }};
font-size: 17px;
Expand Down Expand Up @@ -47,7 +47,7 @@ div.sphinxsidebar {
hr {
border: 1px solid #B1B4B6;
}

div.body {
background-color: #ffffff;
color: #3E4349;
Expand All @@ -58,7 +58,7 @@ img.floatingflask {
padding: 0 0 10px 10px;
float: right;
}

div.footer {
width: {{ page_width }};
margin: 20px auto 30px auto;
Expand All @@ -74,7 +74,7 @@ div.footer a {
div.related {
display: none;
}

div.sphinxsidebar a {
color: #444;
text-decoration: none;
Expand All @@ -84,7 +84,7 @@ div.sphinxsidebar a {
div.sphinxsidebar a:hover {
border-bottom: 1px solid #999;
}

div.sphinxsidebar {
font-size: 15px;
line-height: 1.5;
Expand All @@ -99,7 +99,7 @@ div.sphinxsidebarwrapper p.logo {
margin: 0;
text-align: center;
}

div.sphinxsidebar h3,
div.sphinxsidebar h4 {
font-family: {{ font_family }};
Expand All @@ -113,7 +113,7 @@ div.sphinxsidebar h4 {
div.sphinxsidebar h4 {
font-size: 20px;
}

div.sphinxsidebar h3 a {
color: #444;
}
Expand All @@ -124,7 +124,7 @@ div.sphinxsidebar p.logo a:hover,
div.sphinxsidebar h3 a:hover {
border: none;
}

div.sphinxsidebar p {
color: #555;
margin: 10px 0;
Expand All @@ -135,7 +135,7 @@ div.sphinxsidebar ul {
padding: 0;
color: #000;
}

div.sphinxsidebar input {
border: 1px solid #ccc;
font-family: {{ font_family }};
Expand All @@ -145,19 +145,19 @@ div.sphinxsidebar input {
div.sphinxsidebar form.search input[name="q"] {
width: 130px;
}

/* -- body styles ----------------------------------------------------------- */

a {
color: #aa0000;
text-decoration: underline;
}

a:hover {
color: #dd0000;
text-decoration: underline;
}

div.body h1,
div.body h2,
div.body h3,
Expand All @@ -170,25 +170,25 @@ div.body h6 {
padding: 0;
color: black;
}

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;
}
Expand Down Expand Up @@ -235,20 +235,20 @@ 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: ":";
}
Expand Down Expand Up @@ -342,7 +342,7 @@ ul, ol {
margin: 10px 0 10px 30px;
padding: 0;
}

pre {
background: #eee;
padding: 7px 30px;
Expand All @@ -359,7 +359,7 @@ dl dl pre {
margin-left: -90px;
padding-left: 90px;
}

tt {
background-color: #E8EFF0;
color: #222;
Expand Down
4 changes: 2 additions & 2 deletions deps/v8_inspector/deps/jinja2/docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ useful if you want to dig deeper into Jinja2 or :ref:`develop extensions
For a more complex example you can provide a hint. For example
the :func:`first` filter creates an undefined object that way::

return environment.undefined('no first item, sequence was empty')
return environment.undefined('no first item, sequence was empty')

If it the `name` or `obj` is known (for example because an attribute
was accessed) it should be passed to the undefined object, even if
Expand Down Expand Up @@ -714,7 +714,7 @@ Here a simple test that checks if a variable is a prime number::
if n % i == 0:
return False
return True


You can register it on the template environment by updating the
:attr:`~Environment.tests` dict on the environment::
Expand Down
4 changes: 2 additions & 2 deletions deps/v8_inspector/deps/jinja2/docs/extensions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ i18n Extension

**Import name:** `jinja2.ext.i18n`

The i18n extension can be used in combination with `gettext`_ or `babel`_. If
the i18n extension is enabled Jinja2 provides a `trans` statement that marks
The i18n extension can be used in combination with `gettext`_ or `babel`_. If
the i18n extension is enabled Jinja2 provides a `trans` statement that marks
the wrapped string as translatable and calls `gettext`.

After enabling, dummy `_` function that forwards calls to `gettext` is added
Expand Down
2 changes: 1 addition & 1 deletion deps/v8_inspector/deps/jinja2/docs/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ which will install the package via `distribute` in development mode. This also
has the advantage that the C extensions are compiled.

.. _download page: http://pypi.python.org/pypi/Jinja2
.. _distribute: http://pypi.python.org/pypi/distribute
.. _distribute: http://pypi.python.org/pypi/distribute
.. _setuptools: http://peak.telecommunity.com/DevCenter/setuptools
.. _easy_install: http://peak.telecommunity.com/DevCenter/EasyInstall
.. _pip: http://pypi.python.org/pypi/pip
Expand Down
2 changes: 1 addition & 1 deletion deps/v8_inspector/deps/jinja2/docs/jinjastyle.sty
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
%\sphinxlogo%
{\center
\vspace*{3cm}
\includegraphics{logo.pdf}
\includegraphics{logo.pdf}
\vspace{3cm}
\par
{\rm\Huge \@title \par}%
Expand Down
10 changes: 5 additions & 5 deletions deps/v8_inspector/deps/jinja2/docs/templates.rst
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,14 @@ without the `trim_blocks` and `lstrip_blocks` options, this template::
gets rendered with blank lines inside the div::

<div>

yay

</div>

But with both `trim_blocks` and `lstrip_blocks` enabled, the template block
lines are removed and other whitespace is preserved::

<div>
yay
</div>
Expand Down Expand Up @@ -522,12 +522,12 @@ Working with Automatic Escaping
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

When automatic escaping is enabled, everything is escaped by default except
for values explicitly marked as safe. Variables and expressions
for values explicitly marked as safe. Variables and expressions
can be marked as safe either in:

a. the context dictionary by the application with `MarkupSafe.Markup`, or
b. the template, with the `|safe` filter

The main problem with this approach is that Python itself doesn't have the
concept of tainted values; so whether a value is safe or unsafe can get lost.

Expand Down
Loading