X Tutup
Skip to content

Commit 0424031

Browse files
sebastianwsebastianw
committed
Update to python 2.6, remove simplejson dependency
This updates the requirements to python 2.6, removing the simplejson dependency as simplejson is included from python 2.6 onwards. Also various things were cleaned up/corrected: * Removed included simplejson * Google APP Engine has also moved to python 2.7 so the import logic for simplejson in __init__.py was removed, as well as the unused urlparse imports. https://developers.google.com/appengine/docs/python/python25/diff27 * Cleaned up unused libraries/dependencies in documentation This closes bear#123
1 parent 6d2b0bc commit 0424031

File tree

14 files changed

+8
-3508
lines changed

14 files changed

+8
-3508
lines changed

‎NOTICE‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
11
NOTICE
22

3-
The simplejson library (http://simplejson.googlecode.com) is used under the terms of the MIT license and is copyright Bob Ippolito.
4-
See http://simplejson.googlecode.com/svn/trunk/LICENSE.txt for details.
5-
6-
The python-oauth2 library (http://github.com/simplegeo/python-oauth2) is used under the terms of the MIT license and is copyright Leah Culver.
7-
See http://github.com/simplegeo/python-oauth2/blob/master/LICENSE.txt for details.
8-
9-
The httplib2 library (http://code.google.com/p/httplib2) is used under the terms of the MIT license and is copyright Joe Gregorio.
10-
See http://code.google.com/p/httplib2/source/browse/python2/httplib2/__init__.py for details.
11-
123
This code is made available under the Apache License and is copyright the Python-Twitter Developers.
13-

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Author: The Python-Twitter Developers <python-twitter@googlegroups.com>
66

77
## Introduction
88

9-
This library provides a pure Python interface for the [Twitter API](https://dev.twitter.com/). It works with Python versions from 2.5 to 2.7. Python 3 support is under development.
9+
This library provides a pure Python interface for the [Twitter API](https://dev.twitter.com/). It works with Python version 2.6+. Python 3 support is under development.
1010

1111
[Twitter](http://twitter.com) provides a service that allows people to connect via the web, IM, and SMS. Twitter exposes a [web services API](http://dev.twitter.com/doc) and this library is intended to make it even easier for Python programmers to use.
1212

@@ -21,7 +21,6 @@ From source:
2121
Install the dependencies:
2222

2323
- [Requests](http://docs.python-requests.org/en/latest/)
24-
- [SimpleJson](http://cheeseshop.python.org/pypi/simplejson)
2524
- [Requests OAuthlib](https://requests-oauthlib.readthedocs.org/en/latest/)
2625

2726
Alternatively use `pip`:

‎doc/index.rst‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Author: The Python-Twitter Developers <python-twitter@googlegroups.com>
1111

1212
Introduction
1313
------------
14-
This library provides a pure Python interface for the `Twitter API <https://dev.twitter.com/>`_. It works with Python versions from 2.5 to 2.7. Python 3 support is under development.
14+
This library provides a pure Python interface for the `Twitter API <https://dev.twitter.com/>`_. It works with Python version 2.6+. Python 3 support is under development.
1515

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

@@ -22,14 +22,8 @@ From source:
2222

2323
Install the dependencies:
2424

25-
- `SimpleJson <http://cheeseshop.python.org/pypi/simplejson>`_
26-
- `Requests OAuthlib <https://requests-oauthlib.readthedocs.org/en/latest/>`_
27-
- `HTTPLib2 <http://code.google.com/p/httplib2/>`_
28-
29-
This branch is currently in development to replace the OAuth and HTTPLib2 libarays with the following:
30-
3125
- `Requests <http://docs.python-requests.org/en/latest/>`_
32-
26+
- `Requests OAuthlib <https://requests-oauthlib.readthedocs.org/en/latest/>`_
3327

3428
Alternatively use `pip`::
3529

‎python-twitter.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Source0: http://python-twitter.googlecode.com/files/%{name}-%{version}.ta
1212
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
1313

1414
BuildArch: noarch
15-
Requires: python >= 2.4, python-simplejson >= 2.0.7
15+
Requires: python >= 2.6
1616
BuildRequires: python-setuptools
1717

1818

‎requirements.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
requests==2.2.0
22
requests-oauthlib==0.4.0
3-
simplejson==3.3.2
43
wsgiref==0.1.2
5-
oauthlib==0.6.0
4+
oauthlib==0.6.0

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
# Extra package metadata to be used only if setuptools is installed
3737
SETUPTOOLS_METADATA = dict(
38-
install_requires = ['setuptools', 'simplejson', 'requests', 'requests_oauthlib'],
38+
install_requires = ['setuptools', 'requests', 'requests_oauthlib'],
3939
include_package_data = True,
4040
classifiers = [
4141
'Development Status :: 5 - Production/Stable',

‎simplejson/__init__.py‎

Lines changed: 0 additions & 316 deletions
This file was deleted.

0 commit comments

Comments
 (0)
X Tutup