license

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Christian Koepp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

MANIFEST.in

@@ -1 +1 @@
-include README.markdown
+include README.markdown LICENSE

README.markdown

@@ -51,3 +51,12 @@ The result will be a text looking similar to this one. But as you see unfortunat
 
 ##Wanna have more details?
 If you'd like to get more information about how TwitterSearch works interally and how to use it with all it's possibilities have a look at the [Wiki](https://github.com/ckoepp/TwitterSearch/wiki).
+
+##License (MIT)
+Copyright (C) 2013 Christian Koepp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

TwitterSearch/TwitterSearch.py

@@ -1,10 +1,13 @@
-import simplejson
 import oauth2 as oauth
 from sys import maxint
 from urlparse import parse_qs
 from TwitterSearchException import TwitterSearchException
 from TwitterSearchOrder import TwitterSearchOrder
 
+# python3 & python2.6
+try: import simplejson
+except ImportError: import json as simplejson
+
 class TwitterSearch(object):
     base_url = 'https://api.twitter.com/1.1/'
     verify_url = 'account/verify_credentials.json'

TwitterSearch/TwitterSearchOrder.py

@@ -1,8 +1,11 @@
 import urllib
-import urlparse
 import datetime
 from TwitterSearchException import TwitterSearchException
 
+# python3 & python2.6
+try: from urllib import parse
+except ImportError: from urlparse import parse_qs as parse
+
 class TwitterSearchOrder(object):
 
     # default value for count should be the maximum value to minimize traffic
@@ -35,7 +38,7 @@ def setSearchURL(self, url):
         if url[0] == '?':
             url = url[1:]
 
-        args = urlparse.parse_qs(url)
+        args = parse(url)
         self.searchterms = args['q']
         del args['q']
 

setup.py

@@ -15,6 +15,13 @@ def readme():
       packages=['TwitterSearch'],
       keywords='twitter api search',
       classifiers=[
+          'Programming Language :: Python',
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.6',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.2',
+          'Programming Language :: Python :: 3.3',
           'Development Status :: 3 - Alpha',
           'Intended Audience :: Science/Research',
           'Operating System :: OS Independent',