fix flake8

awx/api/serializers.py

@@ -4535,13 +4535,13 @@ class Meta:
     # - COUNT > 999
     def validate_rrule(self, value):
         rrule_value = value
-        multi_by_month_day = ".*?BYMONTHDAY[\:\=][0-9]+,-*[0-9]+"
-        multi_by_month = ".*?BYMONTH[\:\=][0-9]+,[0-9]+"
-        by_day_with_numeric_prefix = ".*?BYDAY[\:\=][0-9]+[a-zA-Z]{2}"
-        match_count = re.match(".*?(COUNT\=[0-9]+)", rrule_value)
-        match_multiple_dtstart = re.findall(".*?(DTSTART(;[^:]+)?\:[0-9]+T[0-9]+Z?)", rrule_value)
-        match_native_dtstart = re.findall(".*?(DTSTART:[0-9]+T[0-9]+) ", rrule_value)
-        match_multiple_rrule = re.findall(".*?(RRULE\:)", rrule_value)
+        multi_by_month_day = r".*?BYMONTHDAY[\:\=][0-9]+,-*[0-9]+"
+        multi_by_month = r".*?BYMONTH[\:\=][0-9]+,[0-9]+"
+        by_day_with_numeric_prefix = r".*?BYDAY[\:\=][0-9]+[a-zA-Z]{2}"
+        match_count = re.match(r".*?(COUNT\=[0-9]+)", rrule_value)
+        match_multiple_dtstart = re.findall(r".*?(DTSTART(;[^:]+)?\:[0-9]+T[0-9]+Z?)", rrule_value)
+        match_native_dtstart = re.findall(r".*?(DTSTART:[0-9]+T[0-9]+) ", rrule_value)
+        match_multiple_rrule = re.findall(r".*?(RRULE\:)", rrule_value)
         if not len(match_multiple_dtstart):
             raise serializers.ValidationError(_('Valid DTSTART required in rrule. Value should start with: DTSTART:YYYYMMDDTHHMMSSZ'))
         if len(match_native_dtstart):

awx/main/expect/isolated_manager.py

@@ -38,7 +38,7 @@ def __init__(self, args, cwd, env, stdout_handle, ssh_key_path,
         :param stdout_handle:       a file-like object for capturing stdout
         :param ssh_key_path:        a filepath where SSH key data can be read
         :param expect_passwords:    a dict of regular expression password prompts
-                                    to input values, i.e., {r'Password:\s*?$':
+                                    to input values, i.e., {r'Password:*?$':
                                     'some_password'}
         :param cancelled_callback:  a callable - which returns `True` or `False`
                                     - signifying if the job has been prematurely

awx/main/expect/run.py

@@ -71,7 +71,7 @@ def run_pexpect(args, cwd, env, logfile,
                                 - signifying if the job has been prematurely
                                   cancelled
     :param expect_passwords:    a dict of regular expression password prompts
-                                to input values, i.e., {r'Password:\s*?$':
+                                to input values, i.e., {r'Password:*?$':
                                 'some_password'}
     :param extra_update_fields: a dict used to specify DB fields which should
                                 be updated on the underlying model

awx/main/fields.py

@@ -573,10 +573,10 @@ def validate(self, value, model_instance):
                 # string)
                 match = re.search(
                     # 'foo' is a dependency of 'bar'
-                    "'"         # apostrophe
-                    "([^']+)"   # one or more non-apostrophes (first group)
-                    "'[\w ]+'"  # one or more words/spaces
-                    "([^']+)",  # second group
+                    r"'"         # apostrophe
+                    r"([^']+)"   # one or more non-apostrophes (first group)
+                    r"'[\w ]+'"  # one or more words/spaces
+                    r"([^']+)",  # second group
                     error.message,
                 )
                 if match:
@@ -755,7 +755,7 @@ def schema(self, model_instance):
                 'file': {
                     'type': 'object',
                     'patternProperties': {
-                        '^template(\.[a-zA-Z_]+[a-zA-Z0-9_]*)?$': {'type': 'string'},
+                        r'^template(\.[a-zA-Z_]+[a-zA-Z0-9_]*)?$': {'type': 'string'},
                     },
                     'additionalProperties': False,
                 },

awx/main/models/schedules.py

@@ -153,7 +153,7 @@ def coerce_naive_until(cls, rrule):
         if 'until=' in rrule.lower():
             # if DTSTART;TZID= is used, coerce "naive" UNTIL values
             # to the proper UTC date
-            match_until = re.match(".*?(?P<until>UNTIL\=[0-9]+T[0-9]+)(?P<utcflag>Z?)", rrule)
+            match_until = re.match(r".*?(?P<until>UNTIL\=[0-9]+T[0-9]+)(?P<utcflag>Z?)", rrule)
             if not len(match_until.group('utcflag')):
                 # rrule = DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T170000
 

awx/main/tests/docs/test_swagger_generation.py

@@ -119,7 +119,7 @@ def test_basic_paths(self, path, get, admin):
     def test_autogen_response_examples(self, swagger_autogen):
         for pattern, node in TestSwaggerGeneration.JSON['paths'].items():
             pattern = pattern.replace('{id}', '[0-9]+')
-            pattern = pattern.replace('{category_slug}', '[a-zA-Z0-9\-]+')
+            pattern = pattern.replace(r'{category_slug}', r'[a-zA-Z0-9\-]+')
             for path, result in swagger_autogen.items():
                 if re.match('^{}$'.format(pattern), path):
                     for key, value in result.items():

awx/main/tests/unit/test_tasks.py

@@ -891,9 +891,9 @@ def test_multi_vault_password(self):
             (k.pattern, v) for k, v in call_kwargs['expect_passwords'].items()
             if 'Vault' in k.pattern
         )
-        assert vault_passwords['Vault password \(prod\):\\s*?$'] == 'pass@prod'
-        assert vault_passwords['Vault password \(dev\):\\s*?$'] == 'pass@dev'
-        assert vault_passwords['Vault password:\\s*?$'] == ''
+        assert vault_passwords['Vault password \(prod\):\\s*?$'] == 'pass@prod'  # noqa
+        assert vault_passwords['Vault password \(dev\):\\s*?$'] == 'pass@dev'  # noqa
+        assert vault_passwords['Vault password:\\s*?$'] == ''  # noqa
         assert '--ask-vault-pass' not in ' '.join(args)
         assert '--vault-id dev@prompt' in ' '.join(args)
         assert '--vault-id prod@prompt' in ' '.join(args)
@@ -935,9 +935,9 @@ def test_multi_vault_password_ask(self):
             (k.pattern, v) for k, v in call_kwargs['expect_passwords'].items()
             if 'Vault' in k.pattern
         )
-        assert vault_passwords['Vault password \(prod\):\\s*?$'] == 'provided-at-launch@prod'
-        assert vault_passwords['Vault password \(dev\):\\s*?$'] == 'provided-at-launch@dev'
-        assert vault_passwords['Vault password:\\s*?$'] == ''
+        assert vault_passwords['Vault password \(prod\):\\s*?$'] == 'provided-at-launch@prod'  # noqa
+        assert vault_passwords['Vault password \(dev\):\\s*?$'] == 'provided-at-launch@dev'  # noqa
+        assert vault_passwords['Vault password:\\s*?$'] == ''  # noqa
         assert '--ask-vault-pass' not in ' '.join(args)
         assert '--vault-id dev@prompt' in ' '.join(args)
         assert '--vault-id prod@prompt' in ' '.join(args)

awx/main/utils/filters.py

@@ -118,10 +118,10 @@ def string_to_type(t):
     elif t == u'false':
         return False
 
-    if re.search('^[-+]?[0-9]+$',t):
+    if re.search(r'^[-+]?[0-9]+$',t):
         return int(t)
 
-    if re.search('^[-+]?[0-9]+\.[0-9]+$',t):
+    if re.search(r'^[-+]?[0-9]+\.[0-9]+$',t):
         return float(t)
 
     return t

awx/main/utils/safe_yaml.py

@@ -78,10 +78,10 @@ def sanitize_jinja(arg):
     if isinstance(arg, six.string_types):
         # If the argument looks like it contains Jinja expressions
         # {{ x }} ...
-        if re.search('\{\{[^}]+}}', arg) is not None:
+        if re.search(r'\{\{[^}]+}}', arg) is not None:
             raise ValueError('Inline Jinja variables are not allowed.')
         # If the argument looks like it contains Jinja statements/control flow...
         # {% if x.foo() %} ...
-        if re.search('\{%[^%]+%}', arg) is not None:
+        if re.search(r'\{%[^%]+%}', arg) is not None:
             raise ValueError('Inline Jinja variables are not allowed.')
     return arg

awx/plugins/library/scan_services.py

@@ -69,7 +69,7 @@ def gather_services(self):
 
         # Upstart
         if initctl_path is not None and chkconfig_path is None:
-            p = re.compile('^\s?(?P<name>.*)\s(?P<goal>\w+)\/(?P<state>\w+)(\,\sprocess\s(?P<pid>[0-9]+))?\s*$')
+            p = re.compile(r'^\s?(?P<name>.*)\s(?P<goal>\w+)\/(?P<state>\w+)(\,\sprocess\s(?P<pid>[0-9]+))?\s*$')
             rc, stdout, stderr = self.module.run_command("%s list" % initctl_path)
             real_stdout = stdout.replace("\r","")
             for line in real_stdout.split("\n"):
@@ -90,16 +90,16 @@ def gather_services(self):
         elif chkconfig_path is not None:
             #print '%s --status-all | grep -E "is (running|stopped)"' % service_path
             p = re.compile(
-                '(?P<service>.*?)\s+[0-9]:(?P<rl0>on|off)\s+[0-9]:(?P<rl1>on|off)\s+[0-9]:(?P<rl2>on|off)\s+'
-                '[0-9]:(?P<rl3>on|off)\s+[0-9]:(?P<rl4>on|off)\s+[0-9]:(?P<rl5>on|off)\s+[0-9]:(?P<rl6>on|off)')
+                r'(?P<service>.*?)\s+[0-9]:(?P<rl0>on|off)\s+[0-9]:(?P<rl1>on|off)\s+[0-9]:(?P<rl2>on|off)\s+'
+                r'[0-9]:(?P<rl3>on|off)\s+[0-9]:(?P<rl4>on|off)\s+[0-9]:(?P<rl5>on|off)\s+[0-9]:(?P<rl6>on|off)')
             rc, stdout, stderr = self.module.run_command('%s' % chkconfig_path, use_unsafe_shell=True)
             # Check for special cases where stdout does not fit pattern
             match_any = False
             for line in stdout.split('\n'):
                 if p.match(line):
                     match_any = True
             if not match_any:
-                p_simple = re.compile('(?P<service>.*?)\s+(?P<rl0>on|off)')
+                p_simple = re.compile(r'(?P<service>.*?)\s+(?P<rl0>on|off)')
                 match_any = False
                 for line in stdout.split('\n'):
                     if p_simple.match(line):

setup.cfg

@@ -17,5 +17,5 @@ exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory/ec2.py,awx/plugins
 
 [flake8]
 max-line-length=160
-ignore=E201,E203,E221,E225,E231,E241,E251,E261,E265,E303,W291,W391,W293,E731,F405
+ignore=E201,E203,E221,E225,E231,E241,E251,E261,E265,E303,W291,W391,W293,E731,F405,W504
 exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/tests/data,node_modules/,awx/projects/,tools/docker,awx/settings/local_*.py,installer/openshift/settings.py,build/,installer/