fixing merge conflicts and even a couple oddities that were probably … · OverFlowData/python-twitter@0932bdb · GitHub
Skip to content

Commit 0932bdb

Browse files
committed
fixing merge conflicts and even a couple oddities that were probably bugs
2 parents 2bbc969 + b221765 commit 0932bdb

13 files changed

Lines changed: 2621 additions & 2521 deletions

File tree

setup.py

Lines changed: 2 additions & 1 deletion

twitter/__init__.py

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#!/usr/bin/env python
2+
#
3+
# vim: sw=2 ts=2 sts=2
4+
#
5+
# Copyright 2007 The Python-Twitter Developers
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
19+
'''A library that provides a Python interface to the Twitter API'''
20+
21+
__author__ = 'python-twitter@googlegroups.com'
22+
__version__ = '2.0'
23+
24+
try:
25+
# Python >= 2.6
26+
import json as simplejson
27+
except ImportError:
28+
try:
29+
# Python < 2.6
30+
import simplejson
31+
except ImportError:
32+
try:
33+
# Google App Engine
34+
from django.utils import simplejson
35+
except ImportError:
36+
raise ImportError, "Unable to load a json library"
37+
# parse_qsl moved to urlparse module in v2.6
38+
try:
39+
from urlparse import parse_qsl, parse_qs
40+
except ImportError:
41+
from cgi import parse_qsl, parse_qs
42+
43+
try:
44+
from hashlib import md5
45+
except ImportError:
46+
from md5 import md5
47+
48+
from _file_cache import _FileCache
49+
from error import TwitterError
50+
from direct_message import DirectMessage
51+
from hashtag import Hashtag
52+
from parse_tweet import ParseTweet
53+
from trend import Trend
54+
from url import Url
55+
from status import Status
56+
from user import User, UserStatus
57+
from list import List
58+
from api import Api

twitter/_file_cache.py

Lines changed: 150 additions & 0 deletions

0 commit comments

Comments
 (0)