Skip to content

Commit adfe58d

Browse files
sigmavirus24sigmavirus24
committed
Merge branch 'develop' into uritemplate
Conflicts: setup.py
2 parents 8610230 + c7da039 commit adfe58d

30 files changed

Lines changed: 729 additions & 132 deletions

‎AUTHORS.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,5 @@ Contributors
4545
- James Pearson (@xiongchiamiov)
4646

4747
- INADA Naoki (@methane)
48+
49+
- Matias Bordese (@matiasb)

‎README.rst‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
1-
github3.py
2-
==========
3-
41
.. image::
5-
https://secure.travis-ci.org/sigmavirus24/github3.py.png?branch=mock
6-
:alt: Build Status
7-
:target: http://travis-ci.org/sigmavirus24/github3.py
8-
9-
.. image:: https://pypip.in/d/github3.py/badge.png
10-
:alt: Downloads
11-
:target: https://crate.io/packages/github3.py
2+
https://raw.github.com/sigmavirus24/github3.py/develop/images/gh3-logo.png
123

134
github3.py is a comprehensive, actively developed and extraordinarily stable
145
wrapper around the GitHub API (v3).
@@ -80,6 +71,11 @@ Ian Cordasco (sigmavirus24)
8071
Contact Options
8172
---------------
8273

83-
- It is preferred that you send an email to github3.py@librelist.com
74+
- Feel free to use the `github3.py`_ tag on StackOverflow for any questions
75+
you may have
76+
- If you dislike StackOverflow it is preferred that you send an email to
77+
github3.py@librelist.com
8478
- You may also contact (via email) the author directly with
85-
questions/suggestions/comments
79+
questions/suggestions/comments or if you wish to include sensitive data.
80+
81+
.. _github3.py: http://stackoverflow.com/questions/tagged/github3.py

‎docs/examples/issue.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ browser focusing on the comment **you** just created.
4242
The following shows how you could use github3.py to fetch and display your
4343
issues in your own style and in your webbrowser.
4444

45-
.. include:: source/browser.py
46-
:code: python
45+
.. literalinclude:: source/browser.py
46+
:language: python
4747

4848
Or how to do the same by wrapping the lines in your terminal.
4949

50-
.. include:: source/wrap_text.py
51-
:code: python
50+
.. literalinclude:: source/wrap_text.py
51+
:language: python

‎docs/examples/logging.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Using Logging with github3.py
88
The following example shows how to set up logging for github3.py. It is off by
99
default in the library and will not pollute your logs.
1010

11-
.. include:: source/logging_ex.py
12-
:code: python
11+
.. literalinclude:: source/logging_ex.py
12+
:language: python
1313

1414
One thing to note is that if you want more detailed information about what is
1515
happening while the requests are sent, you can do the following:

‎docs/examples/octocat.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
A Conversation With Octocat
22
===========================
33

4-
.. include:: source/octocat_say.py
5-
:code: python
4+
.. literalinclude:: source/octocat_say.py
5+
:language: python
66

77
What you should see
88

‎docs/gists.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Gists
88
.. |Gist| replace:: :class:`Gist <github3.gists.gist.Gist>`
99
.. |GistComment| replace:: :class:`GistComment <github3.gists.comment.GistComment>`
1010
.. |GistFile| replace:: :class:`GistFile <github3.gists.file.GistFile>`
11-
.. |GistHistory| replace:: :class: `GistHistory <github3.gists.history.GistHistory>`
11+
.. |GistHistory| replace:: :class:`GistHistory <github3.gists.history.GistHistory>`
1212

1313
This part of the documentation details the properties and methods associated
1414
with |Gist|, |GistComment|, |GistHistory|, and |GistFile| objects. These

0 commit comments

Comments
 (0)