pep8/pyflakes

collective · Apr 11, 2014 · 158aabc · 158aabc
1 parent 226ad29
commit 158aabc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/collective/weather/portlets/weather.py b/src/collective/weather/portlets/weather.py
@@ -68,7 +68,7 @@ def update(self):
             self.current_city = {'location_id': location.value, 'name': location.title}
 
         self.weather_info = None
-        if not self.current_city is None:
+        if self.current_city is not None:
             weather_utility.update_weather_info(self.current_city['location_id'])
             self.weather_info = weather_utility.get_weather_info(self.current_city)
 

diff --git a/src/collective/weather/tests/test_weather_portlet.py b/src/collective/weather/tests/test_weather_portlet.py
@@ -108,11 +108,11 @@ def test_render(self):
         # XXX: at this point the weather information has already been
         #      updated by another test; we need to isolate this
         # at first rendering no weather information is available
-        #self.assertIn(u'Cordoba, Argentina', r.render())
-        #self.assertIn(u'No weather information', r.render())
+        # self.assertIn(u'Cordoba, Argentina', r.render())
+        # self.assertIn(u'No weather information', r.render())
 
         # call the update weather view and test again
-        #self.portal.unrestrictedTraverse('@@update-weather')()
+        # self.portal.unrestrictedTraverse('@@update-weather')()
         self.assertIn(u'Cordoba, Argentina', r.render())
         self.assertIn(u'Windy', r.render())
         self.assertIn(u'20\xb0C', r.render())
diff --git a/src/collective/weather/tests/test_weather_utility.py b/src/collective/weather/tests/test_weather_utility.py
@@ -75,7 +75,7 @@ def test_update_locations(self):
 
         self.assertEqual(actual_values, expected_values)
 
-        #restore old values
+        # restore old values
         settings.location_ids = old_ids
 
     def test_update_weather_info(self):

diff --git a/src/collective/weather/weather_utility.py b/src/collective/weather/weather_utility.py
@@ -87,7 +87,7 @@ def _update_weather_info(self, location_id=None):
                     result = {'error': msg}
             logger.info(u'Result: {0}'.format(result))
 
-            if not result == {} and not 'error' in result and \
+            if not result == {} and 'error' not in result and \
                'temperature' in result and \
                'summary' in result and \
                'icon' in result: