#1005 Make python tools adhere to the pep8 coding standard
Merged 4 years ago by codeblock. Opened 4 years ago by fbaumanis.
fbaumanis/fedora-websites tools_flake8_fixes  into  master

file modified
+8 -7
@@ -11,7 +11,6 @@ 

  

  from __future__ import print_function

  

- import collections

  import copy

  from datetime import datetime, timedelta

  import functools
@@ -31,6 +30,7 @@ 

  

  session = requests.session()

  

+ 

  def get_page(page, pages):

      """ Retrieve the JSON for a particular page of datagrepper results """

      log.debug("Getting page %i of %s", page, pages)
@@ -97,7 +97,7 @@ 

              cachetime = datetime.strptime(cache['timestamp'], dateformat)

              if cachetime > (datetime.utcnow() - timedelta(days=1)):

                  return filter_messages(cache['messages'], target)

-     except:

+     except FileNotFoundError:

          log.info('No cache, loading from scratch')

  

      messages = list(retrieve_messages())
@@ -130,18 +130,19 @@ 

          collected = collected_fedimg_vars[name]

  

          for key in handtyped:

-             if not key in collected:

+             if key not in collected:

                  log.warn("collected %r is missing %r" % (name, key))

  

          for key in collected:

-             if not key in handtyped:

+             if key not in handtyped:

                  log.warn("handtyped %r is missing %r" % (name, key))

  

  

  def mocked_fedimg(templates):

-     regions = ['us-east-1', 'ap-northeast-1', 'sa-east-1', 'ap-southeast-1', 'ap-southeast-2',

-                'us-west-2', 'us-west-1', 'eu-central-1', 'eu-west-1', 'ap-northeast-2',

-                'ap-south-1', 'ca-central-1', 'eu-west-2', 'us-east-2', 'eu-west-3']

+     regions = ['us-east-1', 'ap-northeast-1', 'sa-east-1', 'ap-southeast-1',

+                'ap-southeast-2', 'us-west-2', 'us-west-1', 'eu-central-1',

+                'eu-west-1', 'ap-northeast-2', 'ap-south-1', 'ca-central-1',

+                'eu-west-2', 'us-east-2', 'eu-west-3']

      mockdata = {}

      for region in regions:

          mockdata[region] = 'ami-mocked'

file modified
+2 -3
@@ -34,7 +34,6 @@ 

      return response.json()

  

  

- 

  def get_messages(days):

      """ Generator that yields messages from datagrepper """

  
@@ -43,7 +42,7 @@ 

      # Get the first page

      data = get_page(1, 'unknown', delta)

      for message in data['raw_messages']:

-          yield message

+         yield message

  

      more = functools.partial(get_page, pages=data['pages'], delta=delta)

  
@@ -80,7 +79,7 @@ 

      messages = get_messages(args.days)

      for message in messages:

          key = message['msg']['image_name']

-         if not key in results:

+         if key not in results:

              results[key] = []

          results[key].append(message['msg'])

  

Make python tools adhere to the pep8 coding standard.

Pull-Request has been merged by codeblock

4 years ago