Merge pull request #19 from DengYiping/temp

Improving code quality by linting unit tests and portions of loklak.py (rebased)

Author: sudheesh001

Examples/loklak-tweets-search.py

@@ -1,13 +1,12 @@
 from loklak import Loklak
-import json
 
 myTweets = Loklak()
 
-movieName = raw_input("What movie would you like to search recent tweets for? ") #asks for what user would like to search for
+movieName = raw_input("What movie would you like to \
+search recent tweets for? ") #asks for what user would like to search for
 
 index = 1
 for tweet in myTweets.search(movieName)["statuses"]: #searches movie and finds "statuses" where "text" is under
-    print '%d%s' %(index, '.') #prints the tweet number
-    print tweet["text"] + "\n" #prints the text of the tweet and makes a new line
-    index+=1 #increments index
-        
+    print("%d%s", index, '.') #prints the tweet number
+    print("%s\n", tweet["text"]) #prints the text of the tweet and makes a new line
+    index += 1 #increments index

README.md

@@ -1,5 +1,5 @@
 ## Python Loklak API
-[![PyPI version](https://badge.fury.io/py/python-loklak-api.svg)](https://badge.fury.io/py/python-loklak-api) 
+[![PyPI version](https://badge.fury.io/py/python-loklak-api.svg)](https://badge.fury.io/py/python-loklak-api)
 [![Build Status](https://travis-ci.org/loklak/python-loklak-api.svg?branch=master)](https://travis-ci.org/loklak/python-loklak-api)
 [![Code Health](https://landscape.io/github/loklak/python-loklak-api/master/landscape.svg?style=flat)](https://landscape.io/github/loklak/python-loklak-api/master)
 --------------------------------------------
@@ -73,7 +73,7 @@ Using the object created above, `l.status()` returns a json of the status as fol
 
 ##### Settings of the loklak server (strictly only for localhost clients)
 
-Using the object created above `l.settings()` returns a json of the settings being used by the loklak server
+Using the class method `settings()` to returns a json of the settings being used by the loklak server
 
 ##### Hello test - Check if the server is responding properly and is online
 

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'

sample.py

@@ -1,5 +1,3 @@
-import unittest
-import shutil
 import tempfile
 from loklak import Loklak
 from pprint import pprint
@@ -40,8 +38,8 @@
 geocode = l.geocode(['New York', 'Singapore'])
 pprint(geocode)
 
-# Loklak Map API
-png_data = l.map(17.582729, 79.118320, 512, 512, 12, 'Hello')
+# Loklak Geographic Map API
+png_data = l.get_map(17.582729, 79.118320, 512, 512, 12, 'Hello')
 path = tempfile.mkstemp(suffix=".png")[1]
 open(path, 'wb').write(png_data)
 
@@ -110,8 +108,7 @@
 pprint(account1)
 
 account2 = l.account('name','update','type')
-pprint(account3)
+pprint(account2)
 
 # Try call function without name
 account3 = l.account(action='update', data='type')
-

test.py

@@ -3,14 +3,18 @@
 
 
 class TestLoklak(unittest.TestCase):
+    """"test class"""
     def setUp(self):
+        """test proper setup"""
         self.loklak = Loklak()
 
     def test_hello(self):
+        """test hello instance"""
         result = self.loklak.hello()
         self.assertEqual(result, {u'status': u'ok'})
 
     def test_geocode(self):
+        """test geological features"""
         result = self.loklak.geocode()
         self.assertEqual(result, '{}')
 
@@ -26,25 +30,28 @@ def test_geocode(self):
             result['locations']['Moscow']['country']
         )
         self.assertTrue(
-            type(result['locations']['Moscow']['place']) == list
+            isinstance(result['locations']['Moscow']['place'], list)
         )
 
     def test_peers(self):
+        """test finding peers"""
         result = self.loklak.peers()
         self.assertTrue('peers' in result)
-        self.assertTrue(type(result['peers']) == list)
+        self.assertTrue(isinstance(result['peers'], list))
         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(type(result['statuses']) == list)
+        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)
@@ -71,6 +78,7 @@ def test_status(self):
             )
 
     def test_user(self):
+        """test user"""
         result = self.loklak.user('dhruvRamani98')
         self.assertTrue('error' in self.loklak.user())
         self.assertTrue('user' in result)