Renaming

Makefile

@@ -37,11 +37,11 @@ docs:
 	$(MAKE) -C doc html
 
 lint:
-	pycodestyle --config={toxinidir}/setup.cfg twitter tests
+	pycodestyle --config={toxinidir}/setup.cfg twitter_api tests
 
 test: lint
-	pytest -s
-	#python setup.py test
+	# pytest -s
+	python3 setup.py test
 
 tox: clean
 	tox

examples/get_all_user_tweets.py

@@ -16,7 +16,7 @@
 import json
 import sys
 
-import twitter
+import twitter_api as twitter
 from t import ACCESS_TOKEN_KEY, ACCESS_TOKEN_SECRET, CONSUMER_KEY, CONSUMER_SECRET
 
 

examples/twitter-to-xhtml.py

@@ -23,7 +23,7 @@
 import sys
 import argparse
 
-import twitter
+import twitter_api as twitter
 
 from t import *
 

examples/view_friends.py

@@ -27,7 +27,7 @@
 #
 
 from __future__ import print_function
-import twitter
+import twitter_api as twitter
 
 CONSUMER_KEY = 'WWWWWWWW'
 CONSUMER_SECRET = 'XXXXXXXX'

setup.cfg

@@ -14,5 +14,5 @@ ignore =
 ignore = E111,E124,E126,E221,E501
 
 [pycodestyle]
-ignore = E111,E124,E126,E221,E501
+ignore = E111,E124,E126,E221,E501,E741
 max-line-length = 100

setup.py

@@ -30,7 +30,7 @@ def read(filename):
     with codecs.open(os.path.join(cwd, filename), 'rb', 'utf-8') as h:
         return h.read()
 
-metadata = read(os.path.join(cwd, 'twitter', '__init__.py'))
+metadata = read(os.path.join(cwd, 'twitter_api', '__init__.py'))
 
 def extract_metaitem(meta):
     # swiped from https://hynek.me 's attr package
@@ -70,8 +70,8 @@ def extract_metaitem(meta):
         'Topic :: Internet',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
+        # 'Programming Language :: Python :: 2.7',
+        # 'Programming Language :: Python :: 3',
+        # 'Programming Language :: Python :: 3.6',
     ],
 )

tests/test_api_30.py

@@ -13,7 +13,7 @@
     from mock import patch
 import warnings
 
-import twitter
+import twitter_api as twitter
 
 import responses
 from responses import GET, POST
@@ -1762,7 +1762,7 @@ def testShowFriendship(self):
         )
 
     @responses.activate
-    @patch('twitter.api.Api.UploadMediaChunked')
+    @patch('twitter_api.api.Api.UploadMediaChunked')
     def test_UploadSmallVideoUsesChunkedData(self, mocker):
         responses.add(POST, DEFAULT_URL, body='{}')
         video = NamedTemporaryFile(suffix='.mp4')

tests/test_direct_messages.py

@@ -5,7 +5,7 @@
 
 import re
 
-import twitter
+import twitter_api as twitter
 
 import responses
 from responses import GET, POST

tests/test_error_handling.py

@@ -7,7 +7,7 @@
 import unittest
 import warnings
 
-import twitter
+import twitter_api as twitter
 import responses
 from responses import GET, POST
 

tests/test_filecache.py

@@ -1,4 +1,4 @@
-import twitter
+import twitter_api as twitter
 import unittest
 import time
 

tests/test_friendship.py

@@ -13,7 +13,7 @@
     from mock import patch
 import warnings
 
-import twitter
+import twitter_api as twitter
 
 import responses
 from responses import GET, POST

tests/test_media.py

@@ -3,7 +3,7 @@
 import json
 import unittest
 
-import twitter
+import twitter_api as twitter
 
 
 class MediaTest(unittest.TestCase):

tests/test_models.py

@@ -1,4 +1,4 @@
-import twitter
+import twitter_api as twitter
 import json
 import re
 import unittest

tests/test_parse_tweet.py

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 import unittest
-import twitter
+import twitter_api as twitter
 
 
 class ParseTest(unittest.TestCase):

tests/test_rate_limit.py

@@ -6,7 +6,7 @@
 import unittest
 import warnings
 
-import twitter
+import twitter_api as twitter
 import responses
 from responses import GET, POST
 

tests/test_searching.py

@@ -13,7 +13,7 @@
     from mock import patch
 import warnings
 
-import twitter
+import twitter_api as twitter
 
 import responses
 from responses import GET, POST

tests/test_status.py

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 import sys
-import twitter
+import twitter_api as twitter
 import calendar
 import time
 import json

tests/test_streaming.py

@@ -6,7 +6,7 @@
 import json
 import unittest
 
-import twitter
+import twitter_api as twitter
 
 
 def test_streaming_extended_tweet():

tests/test_trend.py

@@ -1,4 +1,4 @@
-import twitter
+import twitter_api as twitter
 import unittest
 import json
 

tests/test_tweet_changes.py

@@ -7,7 +7,7 @@
 import unittest
 import warnings
 
-import twitter
+import twitter_api as twitter
 import responses
 from responses import GET
 

tests/test_tweet_length.py

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 import unittest
-import twitter
+import twitter_api as twitter
 
 
 class TestTweetLength(unittest.TestCase):

tests/test_twitter_utils.py

@@ -6,13 +6,13 @@
 
 import responses
 
-import twitter
-from twitter.twitter_utils import (
+import twitter_api as twitter
+from twitter_api.twitter_utils import (
     calc_expected_status_length,
     parse_media_file
 )
 
-from twitter import twitter_utils as utils
+from twitter_api import twitter_utils as utils
 
 if sys.version_info > (3,):
     unicode = str

tests/test_unicode.py

@@ -12,7 +12,7 @@
 from hypothesis import given, example
 from hypothesis import strategies as st
 
-import twitter
+import twitter_api as twitter
 
 warnings.filterwarnings('ignore', category=DeprecationWarning)
 

tests/test_url_regex.py

@@ -7,8 +7,8 @@
 import unittest
 import warnings
 
-import twitter
-from twitter import twitter_utils
+import twitter_api as twitter
+from twitter_api import twitter_utils
 
 import responses
 from responses import GET, POST

tests/test_user.py

@@ -1,4 +1,4 @@
-import twitter
+import twitter_api as twitter
 import json
 import unittest
 

twitter/api.py → twitter_api/api.py

@@ -43,7 +43,7 @@
     from urllib import urlencode, quote_plus
     from urllib import __version__ as urllib_version
 
-from twitter import (
+from twitter_api import (
     __version__,
     _FileCache,
     Category,
@@ -55,16 +55,16 @@
     UserStatus,
 )
 
-from twitter.ratelimit import RateLimit
+from twitter_api.ratelimit import RateLimit
 
-from twitter.twitter_utils import (
+from twitter_api.twitter_utils import (
     calc_expected_status_length,
     is_url,
     parse_media_file,
     enf_type,
     parse_arg_list)
 
-from twitter.error import (
+from twitter_api.error import (
     TwitterError,
     PythonTwitterDeprecationWarning330,
 )

twitter/models.py → twitter_api/models.py

@@ -378,7 +378,7 @@ def __repr__(self):
 
     @classmethod
     def NewFromJsonDict(cls, data, **kwargs):
-        from twitter import Status
+        from twitter_api import Status
         if data.get('status', None):
             status = Status.NewFromJsonDict(data.get('status'))
             return super(cls, cls).NewFromJsonDict(data=data, status=status)

twitter/ratelimit.py → twitter_api/ratelimit.py

@@ -5,7 +5,7 @@
 except ImportError:
     from urlparse import urlparse
 
-from twitter.twitter_utils import enf_type
+from twitter_api.twitter_utils import enf_type
 
 EndpointRateLimit = namedtuple('EndpointRateLimit',
                                ['limit', 'remaining', 'reset'])

twitter/twitter_utils.py → twitter_api/twitter_utils.py

@@ -15,8 +15,8 @@
     from urlparse import urlparse
 
 import requests
-from twitter import TwitterError
-import twitter
+from twitter_api import TwitterError
+import twitter_api
 
 if sys.version_info < (3,):
     range = xrange  # noqa
@@ -336,12 +336,12 @@ def parse_arg_list(args, attr):
     out = []
     if isinstance(args, (str, unicode)):
         out.append(args)
-    elif isinstance(args, twitter.User):
+    elif isinstance(args, twitter_api.User):
         out.append(getattr(args, attr))
     elif isinstance(args, (list, tuple)):
         for item in args:
             if isinstance(item, (str, unicode)):
                 out.append(item)
-            elif isinstance(item, twitter.User):
+            elif isinstance(item, twitter_api.User):
                 out.append(getattr(item, attr))
     return ",".join([str(item) for item in out])