X Tutup
Skip to content

Commit f3c88de

Browse files
author
bear (Mike Taylor)
committed
merge master updates
2 parents 4e7d4a2 + 49ed835 commit f3c88de

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+13082
-5737
lines changed

‎AUTHORS.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Now it's a full-on open source project with many contributors over time:
2525
* Lars Weiler,
2626
* Sebastian Wiesinger,
2727
* Jake Robinson,
28+
* Muthu Annamalai,
2829
* abloch,
2930
* cahlan,
3031
* dpslwk,
@@ -33,4 +34,4 @@ Now it's a full-on open source project with many contributors over time:
3334
* git-matrix,
3435
* sbywater,
3536
* thefinn93,
36-
* themylogin,
37+
* themylogin,

‎CHANGES‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
2014-12-29
2+
removed reference to simplejson
3+
14
2014-12-24
25
bump version to v2.3
36
bump version to v2.2
7+
PEP8 standardization
48

59
2014-07-10
610
bump version to v2.1

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ lint:
2828
flake8 twitter > violations.flake8.txt
2929

3030
test:
31-
python twitter_test.py
31+
python test.py
3232

3333
upload: clean
3434
python setup.py sdist upload

‎README.rst‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Python Twitter
22

33
A Python wrapper around the Twitter API.
44

5-
By the Python-Twitter Developers <python-twitter@googlegroups.com>
5+
By the `Python-Twitter Developers <python-twitter@googlegroups.com>`_
66

77
.. image:: https://pypip.in/wheel/python-twitter/badge.png
88
:target: https://pypi.python.org/pypi/python-twitter/
@@ -12,9 +12,9 @@ By the Python-Twitter Developers <python-twitter@googlegroups.com>
1212
Introduction
1313
============
1414

15-
This library provides a pure Python interface for the `Twitter API https://dev.twitter.com/`. It works with Python versions from 2.6+. Python 3 support is under development.
15+
This library provides a pure Python interface for the `Twitter API <https://dev.twitter.com/>`_. It works with Python versions from 2.6+. Python 3 support is under development.
1616

17-
`Twitter http://twitter.com` provides a service that allows people to connect via the web, IM, and SMS. Twitter exposes a `web services API https://dev.twitter.com/overview/documentation` and this library is intended to make it even easier for Python programmers to use.
17+
`Twitter <http://twitter.com>`_ provides a service that allows people to connect via the web, IM, and SMS. Twitter exposes a `web services API <https://dev.twitter.com/overview/documentation>`_ and this library is intended to make it even easier for Python programmers to use.
1818

1919
==========
2020
Installing
@@ -26,8 +26,8 @@ You can install python-twitter using::
2626

2727
Testing::
2828

29-
$ python twitter_test.py
30-
29+
$ python test.py
30+
3131
================
3232
Getting the code
3333
================
@@ -38,19 +38,19 @@ Check out the latest development version anonymously with::
3838

3939
$ git clone git://github.com/bear/python-twitter.git
4040
$ cd python-twitter
41-
41+
4242
Setup a virtual environment and install dependencies:
4343

4444
$ make env
4545

4646
Activate the virtual environment created:
4747

4848
$ source env/bin/activate
49-
49+
5050
Run tests:
5151

5252
$ make test
53-
53+
5454
To see other options available, run:
5555

5656
$ make help
@@ -94,13 +94,13 @@ The API is exposed via the ``twitter.Api`` class.
9494

9595
The python-twitter library now only supports OAuth authentication as the Twitter devs have indicated that OAuth is the only method that will be supported moving forward.
9696

97-
To generate an Access Token you have to pick what type of access your application requires and then do one of the following::
97+
To generate an Access Token you have to pick what type of access your application requires and then do one of the following:
9898

99-
- `Generate a token to access your own account <https://dev.twitter.com/oauth/overview/application-owner-access-tokens>`
100-
- `Generate a pin-based token <https://dev.twitter.com/oauth/pin-based>`
101-
- use the helper script `get_access_token.py <https://github.com/bear/python-twitter/blob/master/get_access_token.py>`
99+
- `Generate a token to access your own account <https://dev.twitter.com/oauth/overview/application-owner-access-tokens>`_
100+
- `Generate a pin-based token <https://dev.twitter.com/oauth/pin-based>`_
101+
- use the helper script `get_access_token.py <https://github.com/bear/python-twitter/blob/master/get_access_token.py>`_
102102

103-
For full details see the `Twitter OAuth Overview <https://dev.twitter.com/oauth/overview>`
103+
For full details see the `Twitter OAuth Overview <https://dev.twitter.com/oauth/overview>`_
104104

105105
To create an instance of the ``twitter.Api`` with login credentials (Twitter now requires an OAuth Access Token for all API calls)::
106106

@@ -143,7 +143,7 @@ There are many more API methods, to read the full API documentation::
143143
Todo
144144
----
145145

146-
Patches and bug reports are [welcome](https://github.com/bear/python-twitter/issues/new), just please keep the style consistent with the original source.
146+
Patches and bug reports are `welcome <https://github.com/bear/python-twitter/issues/new>`_, just please keep the style consistent with the original source.
147147

148148
Add more example scripts.
149149

@@ -157,7 +157,7 @@ The ``twitter.Status`` and ``twitter.User`` classes could perform more validatio
157157
More Information
158158
----------------
159159

160-
Please visit `the google group http://groups.google.com/group/python-twitter` for more discussion.
160+
Please visit `the google group <http://groups.google.com/group/python-twitter>`_ for more discussion.
161161

162162
------------
163163
Contributors
@@ -172,13 +172,13 @@ License
172172
-------
173173

174174
| Copyright 2007-2014 The Python-Twitter Developers
175-
|
175+
|
176176
| Licensed under the Apache License, Version 2.0 (the 'License');
177177
| you may not use this file except in compliance with the License.
178178
| You may obtain a copy of the License at
179-
|
179+
|
180180
| http://www.apache.org/licenses/LICENSE-2.0
181-
|
181+
|
182182
| Unless required by applicable law or agreed to in writing, software
183183
| distributed under the License is distributed on an 'AS IS' BASIS,
184184
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

‎doc/_build/html/_sources/index.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ From source:
2222

2323
Install the dependencies:
2424

25-
- `SimpleJson <http://cheeseshop.python.org/pypi/simplejson>`_
2625
- `Requests OAuthlib <https://requests-oauthlib.readthedocs.org/en/latest/>`_
2726
- `HTTPLib2 <http://code.google.com/p/httplib2/>`_
2827

‎doc/_build/html/_static/basic.css‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,9 @@ img.align-right, .figure.align-right, object.align-right {
235235
}
236236

237237
img.align-center, .figure.align-center, object.align-center {
238-
display: block;
239-
margin-left: auto;
240-
margin-right: auto;
238+
display: block;
239+
margin-left: auto;
240+
margin-right: auto;
241241
}
242242

243243
.align-left {
@@ -416,7 +416,7 @@ dl.glossary dt {
416416
border: 3px solid red;
417417
}
418418

419-
.footnote:target {
419+
.footnote:target {
420420
background-color: #ffa;
421421
}
422422

@@ -453,7 +453,7 @@ abbr, acronym {
453453

454454
pre {
455455
overflow: auto;
456-
overflow-y: hidden; /* fixes display issues on Chrome browsers */
456+
overflow-y: hidden; /* fixes display issues on Chrome browsers */
457457
}
458458

459459
td.linenos pre {

‎doc/_build/html/_static/default.css‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
* :license: BSD, see LICENSE for details.
99
*
1010
*/
11-
1211
@import url("basic.css");
1312

1413
/* -- page layout ----------------------------------------------------------- */
@@ -113,8 +112,6 @@ div.sphinxsidebar input {
113112
font-size: 1em;
114113
}
115114

116-
117-
118115
/* -- hyperlink styles ------------------------------------------------------ */
119116

120117
a {
@@ -131,8 +128,6 @@ a:hover {
131128
text-decoration: underline;
132129
}
133130

134-
135-
136131
/* -- body styles ----------------------------------------------------------- */
137132

138133
div.body h1,
@@ -150,12 +145,30 @@ div.body h6 {
150145
padding: 3px 0 3px 10px;
151146
}
152147

153-
div.body h1 { margin-top: 0; font-size: 200%; }
154-
div.body h2 { font-size: 160%; }
155-
div.body h3 { font-size: 140%; }
156-
div.body h4 { font-size: 120%; }
157-
div.body h5 { font-size: 110%; }
158-
div.body h6 { font-size: 100%; }
148+
div.body h1 {
149+
margin-top: 0;
150+
font-size: 200%;
151+
}
152+
153+
div.body h2 {
154+
font-size: 160%;
155+
}
156+
157+
div.body h3 {
158+
font-size: 140%;
159+
}
160+
161+
div.body h4 {
162+
font-size: 120%;
163+
}
164+
165+
div.body h5 {
166+
font-size: 110%;
167+
}
168+
169+
div.body h6 {
170+
font-size: 100%;
171+
}
159172

160173
a.headerlink {
161174
color: #c60f0f;

0 commit comments

Comments
 (0)
X Tutup