Skip to content

Commit

Permalink
Merge pull request psf#784 from Locker537/docs_fix
Browse files Browse the repository at this point in the history
Change variable '_r' to 'r' for consistency.
  • Loading branch information
Kenneth Reitz committed Aug 17, 2012
2 parents 27f34a5 + b31a439 commit cb0fdd8
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion docs/MANIFEST.in
@@ -1 +1 @@
include HISTORY.rst README.rst LICENSE
include HISTORY.rst README.rst LICENSE
4 changes: 2 additions & 2 deletions docs/_themes/LICENSE
@@ -1,9 +1,9 @@
Modifications:
Modifications:

Copyright (c) 2011 Kenneth Reitz.


Original Project:
Original Project:

Copyright (c) 2010 by Armin Ronacher.

Expand Down
2 changes: 1 addition & 1 deletion docs/_themes/README.rst
@@ -1,7 +1,7 @@
krTheme Sphinx Style
====================

This repository contains sphinx styles Kenneth Reitz uses in most of
This repository contains sphinx styles Kenneth Reitz uses in most of
his projects. It is a derivative of Mitsuhiko's themes for Flask and Flask related
projects. To use this style in your Sphinx documentation, follow
this guide:
Expand Down
2 changes: 1 addition & 1 deletion docs/_themes/kr/theme.conf
Expand Up @@ -4,4 +4,4 @@ stylesheet = flasky.css
pygments_style = flask_theme_support.FlaskyStyle

[options]
touch_icon =
touch_icon =
44 changes: 22 additions & 22 deletions docs/_themes/kr_small/static/flasky.css_t
Expand Up @@ -8,11 +8,11 @@
* :license: BSD, see LICENSE for details.
*
*/

@import url("basic.css");

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

body {
font-family: 'Georgia', serif;
font-size: 17px;
Expand All @@ -35,7 +35,7 @@ div.bodywrapper {
hr {
border: 1px solid #B1B4B6;
}

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

div.footer {
text-align: right;
color: #888;
Expand All @@ -55,12 +55,12 @@ div.footer {
width: 650px;
margin: 0 auto 40px auto;
}

div.footer a {
color: #888;
text-decoration: underline;
}

div.related {
line-height: 32px;
color: #888;
Expand All @@ -69,18 +69,18 @@ div.related {
div.related ul {
padding: 0 0 0 10px;
}

div.related a {
color: #444;
}

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

a {
color: #004B6B;
text-decoration: underline;
}

a:hover {
color: #6D4100;
text-decoration: underline;
Expand All @@ -89,7 +89,7 @@ a:hover {
div.body {
padding-bottom: 40px; /* saved for footer */
}

div.body h1,
div.body h2,
div.body h3,
Expand All @@ -109,24 +109,24 @@ div.indexwrapper h1 {
height: {{ theme_index_logo_height }};
}
{% endif %}

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: white;
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 @@ -164,25 +164,25 @@ div.note {
background-color: #eee;
border: 1px solid #ccc;
}

div.seealso {
background-color: #ffc;
border: 1px solid #ff6;
}

div.topic {
background-color: #eee;
}

div.warning {
background-color: #ffe4e4;
border: 1px solid #f66;
}

p.admonition-title {
display: inline;
}

p.admonition-title:after {
content: ":";
}
Expand Down Expand Up @@ -254,7 +254,7 @@ dl {
dl dd {
margin-left: 30px;
}

pre {
padding: 0;
margin: 15px -30px;
Expand Down
16 changes: 8 additions & 8 deletions docs/user/quickstart.rst
Expand Up @@ -24,7 +24,7 @@ Make a Request
Making a request with Requests is very simple.

Begin by importing the Requests module::

>>> import requests

Now, let's try to get a webpage. For this example, let's get GitHub's public
Expand All @@ -37,12 +37,12 @@ information we need from this object.

Requests' simple API means that all forms of HTTP request are as obvious. For
example, this is how you make an HTTP POST request::

>>> r = requests.post("http://httpbin.org/post")

Nice, right? What about the other HTTP request types: PUT, DELETE, HEAD and
OPTIONS? These are all just as simple::

>>> r = requests.put("http://httpbin.org/put")
>>> r = requests.delete("http://httpbin.org/delete")
>>> r = requests.head("http://httpbin.org/get")
Expand Down Expand Up @@ -70,7 +70,7 @@ You can see that the URL has been correctly encoded by printing the URL::

>>> print r.url
u'http://httpbin.org/get?key2=value2&key1=value1'


Response Content
----------------
Expand Down Expand Up @@ -229,7 +229,7 @@ You can set the filename explicitly::
If you want, you can send strings to be received as files::

>>> url = 'http://httpbin.org/post'
>>> files = {'file': ('report.csv', 'some,data,to,send\nanother,row,to,send\n')}
>>> files = {'file': ('report.csv', 'some,data,to,send\nanother,row,to,send\n')}

>>> r = requests.post(url, files=files)
>>> r.text
Expand Down Expand Up @@ -260,11 +260,11 @@ reference::
If we made a bad request (non-200 response), we can raise it with
:class:`Response.raise_for_status()`::

>>> _r = requests.get('http://httpbin.org/status/404')
>>> _r.status_code
>>> bad_r = requests.get('http://httpbin.org/status/404')
>>> bad_r.status_code
404

>>> _r.raise_for_status()
>>> bad_r.raise_for_status()
Traceback (most recent call last):
File "requests/models.py", line 832, in raise_for_status
raise http_error
Expand Down

0 comments on commit cb0fdd8

Please sign in to comment.