Merge lp:~soren/surveilr/pep8-clean into lp:surveilr

[Soren Hansen]

PEP-8 and pyflakes clean

[Linux2Go Jenkins (linux2go-jenkins)]

No approved revision specified.

=== modified file 'surveilr/api/server.py'
--- surveilr/api/server.py	2011-11-19 22:01:55 +0000
+++ surveilr/api/server.py	2011-11-20 00:24:23 +0000
@@ -38,6 +38,7 @@
 from surveilr import models
 from surveilr import utils
 
+
 class ServiceController(object):
     """Routes style controller for actions related to services"""
 
@@ -49,7 +50,7 @@
         data = json.loads(req.body)
         service = models.Service(**data)
         service.save()
-        response = {'id':service.key}
+        response = {'id': service.key}
         return Response(json.dumps(response))
 
     def show(self, req, id):
@@ -95,6 +96,7 @@
             retval += [{'metrics': x.metrics, 'timestamp': x.timestamp}]
         return Response(json.dumps(retval))
 
+
 class SurveilrApplication(object):
     """The core Surveilr Monitoring WSGI application"""
     controllers = {}
@@ -126,9 +128,11 @@
 
 application = SurveilrApplication()
 
+
 def main():
     socket = eventlet.listen(('', 9877))
     eventlet.wsgi.server(socket, application)
 
-if __name__ == '__main__': # pragma: nocover
+
+if __name__ == '__main__':  # pragma: nocover
     main()

=== modified file 'surveilr/models.py'
--- surveilr/models.py	2011-11-19 22:01:55 +0000
+++ surveilr/models.py	2011-11-20 00:24:23 +0000
@@ -22,6 +22,7 @@
 from riakalchemy import RiakObject
 from riakalchemy.types import Integer, String, Dict, RelatedObjects
 
+
 class Service(RiakObject):
     """A service that is referenced by many LogEntry's
 
@@ -35,6 +36,7 @@
     name = String()
     most_recent_log_entry = RelatedObjects()
 
+
 class LogEntry(RiakObject):
     """A log entry holding one or more metrics
 

=== modified file 'surveilr/tests/test_api_server.py'
--- surveilr/tests/test_api_server.py	2011-11-19 22:01:55 +0000
+++ surveilr/tests/test_api_server.py	2011-11-20 00:24:23 +0000
@@ -27,7 +27,7 @@
 
 from surveilr.api import server
 from surveilr.api.server import application
-from surveilr.api.server import main as server_main
+
 
 class APIServerTests(unittest.TestCase):
     def setUp(self):
@@ -57,7 +57,9 @@
         self.assertEquals(resp.status_int, 404)
 
     def test_create_retrieve_metric(self):
-        req = Request.blank('/services', method='POST', POST='{"name": "this_or_the_other"}')
+        req = Request.blank('/services',
+                            method='POST',
+                            POST='{"name": "this_or_the_other"}')
         resp = application(req)
         self.assertEquals(resp.status_int, 200)
 
@@ -85,6 +87,7 @@
             socket_sentinel = mock.sentinel.return_value
             eventlet.listen.return_value = socket_sentinel
             server.main()
-            
+
             eventlet.listen.assert_called_with(('', 9877))
-            eventlet.wsgi.server.assert_called_with(socket_sentinel, application)
+            eventlet.wsgi.server.assert_called_with(socket_sentinel,
+                                                    application)

=== modified file 'surveilr/utils.py'
--- surveilr/utils.py	2011-11-19 22:01:55 +0000
+++ surveilr/utils.py	2011-11-20 00:24:23 +0000
@@ -20,6 +20,7 @@
     Utility functions
 """
 
+
 def truncate(number, rounding_factor):
     """Truncate to nearest arbitrary multiple