Merge pull request #30 from yasoob/patch-1

updated the code. Pylint rating is at 9.8 from 7.7.

Author: sudheesh001

loklak.py

@@ -25,7 +25,7 @@ class Loklak(object):
     limit = None
     action = None
     data = {}
-    
+
     def status(self):
         """Returns the status of the server"""
         status_application = 'api/status.json'

setup.py

@@ -1,13 +1,14 @@
-import re, uuid
+import re
+import uuid
 
 try:
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
 
 setup(name='python-loklak-api',
-	  version='1.0',
-	  description="Python API for loklak, Anonymous distributed P2P Systems.",
+      version='1.0',
+      description="Python API for loklak, Anonymous distributed P2P Systems.",
       author='Sudheesh Singanamalla',
       author_email='[email protected]',
       url='https://github.com/sudheesh001/python-loklak-api',
@@ -23,12 +24,12 @@
           'Topic :: Internet',
           ],
       keywords="Twitter Loklak Anonymous API",
-      install_requires = [
+      install_requires=[
         "asyncoro==3.5",
         "requests==2.8.1",
         "wsgiref==0.1.2"
       ],
       zip_safe=False,
-      download_url = 'https://github.com/sudheesh001/python-loklak-api',
+      download_url='https://github.com/sudheesh001/python-loklak-api',
       scripts=['bin/loklak']
       )

test.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import unittest
 from loklak import Loklak
 import os
@@ -9,6 +10,21 @@ def setUp(self):
         """test proper setup"""
         self.loklak = Loklak()
 
+    def test_status(self):
+        """test status"""
+        result = self.loklak.status()
+
+        self.assertTrue('index_sizes' in result)
+        result_properties = [
+            'messages', 'mps', 'users', 'queries',
+            'accounts', 'user', 'followers', 'following'
+        ]
+        for prop in result_properties:
+            self.assertTrue(
+                prop in result['index_sizes'],
+                msg='{} not found in index_sizes'.format(prop)
+            )
+
     def test_hello(self):
         """test hello instance"""
         result = self.loklak.hello()
@@ -34,6 +50,23 @@ def test_geocode(self):
             isinstance(result['locations']['Moscow']['place'], list)
         )
 
+    def test_get_map(self):
+        """Tests the get_map method"""
+        map_file = os.path.join(os.getcwd(), 'markdown.png')
+        data = self.loklak.get_map(17.582729, 79.118320)
+        self.assertTrue(data[:8] == '\211PNG\r\n\032\n' and
+                                    (data[12:16] == 'IHDR'))
+        with open(map_file, 'wb') as file_handle:
+            file_handle.write(data)
+        with open(map_file, 'rb') as file_handle:
+            file_contents = file_handle.read()
+        self.assertTrue(os.path.exists(map_file))
+        self.assertEqual(data, file_contents)
+        try:
+            os.remove(map_file)
+        except OSError as error:
+            print(error)
+
     def test_peers(self):
         """test finding peers"""
         result = self.loklak.peers()
@@ -42,42 +75,6 @@ def test_peers(self):
         self.assertTrue(len(result['peers']) >= 1)
         self.assertEqual(len(result['peers']), result['count'])
 
-    def test_search(self):
-        """test search result"""
-        result = self.loklak.search('doctor who')
-        self.assertTrue('error' in self.loklak.search())
-        self.assertTrue('statuses' in result)
-        self.assertTrue(isinstance(result['statuses'], list))
-        self.assertTrue(len(result['statuses']) >= 1)
-        self.assertEqual(len(result['statuses']), int(result['search_metadata']['count']))
-
-    def test_status(self):
-        """test status"""
-        result = self.loklak.status()
-
-        self.assertTrue('index_sizes' in result)
-        result_properties = [
-            'messages', 'mps', 'users', 'queries',
-            'accounts', 'user', 'followers', 'following'
-        ]
-        for prop in result_properties:
-            self.assertTrue(
-                prop in result['index_sizes'],
-                msg='{} not found in index_sizes'.format(prop)
-            )
-
-        self.assertTrue('client_info' in result)
-        client_properties = [
-            'RemoteHost', 'IsLocalhost', 'Host',
-            'Accept-Encoding', 'X-Forwarded-For', 'X-Real-IP',
-            'User-Agent', 'Accept', 'Connection',
-        ]
-        for prop in client_properties:
-            self.assertTrue(
-                prop in result['client_info'],
-                msg='{} not found in client info'.format(prop)
-            )
-
     def test_user(self):
         """test user"""
         result = self.loklak.user('dhruvRamani98')
@@ -86,30 +83,26 @@ def test_user(self):
         self.assertTrue('name' in result['user'])
         self.assertTrue('screen_name' in result['user'])
 
-    def test_get_map(self):
-        self.map_file = os.path.join(os.getcwd(), 'markdown.png')
-        data = self.loklak.get_map(17.582729, 79.118320)
-        self.assertTrue(data[:8] == '\211PNG\r\n\032\n'and (data[12:16] == 'IHDR'))
-        with open(self.map_file, 'wb') as f:
-            f.write(data)
-        with open(self.map_file, 'rb') as f:
-            file_contents = f.read()
-        self.assertTrue(os.path.exists(self.map_file))
-        self.assertEqual(data, file_contents)
-        try:
-            os.remove(self.map_file)
-        except OSError as error:
-            print(error)
+    def test_search(self):
+        """test search result"""
+        result = self.loklak.search('doctor who')
+        self.assertTrue('error' in self.loklak.search())
+        self.assertTrue('statuses' in result)
+        self.assertTrue(isinstance(result['statuses'], list))
+        self.assertTrue(len(result['statuses']) >= 1)
+        self.assertEqual(len(result['statuses']),
+                         int(result['search_metadata']['count']))
+
     def test_aggregations(self):
         """test aggregations"""
-        result = self.loklak.aggregations('sudheesh001','2015-01-10','2015-10-21',['mentions','hashtags'],10)
+        result = self.loklak.aggregations('sudheesh001', '2015-01-10',
+                                          '2015-10-21', ['mentions',
+                                                         'hashtags'], 10)
         data = result.json()
-        self.assertEqual(result.status_code,200)
+        self.assertEqual(result.status_code, 200)
         self.assertTrue('aggregations' in data)
         self.assertTrue('hashtags' in data['aggregations'])
         self.assertTrue('mentions' in data['aggregations'])
 
-
-
 if __name__ == '__main__':
     unittest.main()