#142 Mark lines as noqa to avoid pep8 E126 on EL7
Merged 7 years ago by puiterwijk. Opened 7 years ago by puiterwijk.
puiterwijk/ipsilon el7-pep8  into  master

file modified
+2 -1
@@ -175,6 +175,7 @@ 

                  try:

                      changes['domains'][domain] = {

                          'ldap_user_extra_attrs':

+                             # noqa (pep8 E126)

                              sssd_domain.get_option('ldap_user_extra_attrs')}

                  except SSSDConfig.NoOptionError:

                      pass
@@ -263,7 +264,7 @@ 

                      sssd_domain.set_option('ldap_user_extra_attrs',

                                             changes['domains'][domain][

                                                 'ldap_user_extra_attrs'].encode(

-                                                    'utf-8'))

+                                                'utf-8'))

                  else:

                      sssd_domain.remove_option('ldap_user_extra_attrs')

                  sssdconfig.save_domain(sssd_domain)

file modified
+1 -1
@@ -13,7 +13,7 @@ 

  # other languages.

  PAM_AUTH_ERRORS = {

      "Authentication token is no longer valid; new one required":

-         "Password is expired",

+         "Password is expired",  # noqa (pep8 126)

      "Authentication failure":

          "Authentication failure",

  }

@@ -753,7 +753,7 @@ 

              'userinfo_encryption_alg_values_supported': [],

              'userinfo_encryption_enc_values_supported': [],

              'request_object_signing_alg_values_supported':

-                 jws_default_allowed_algs + ['none'],

+                 jws_default_allowed_algs + ['none'],  # noqa (pep8 E126)

              'request_object_encryption_alg_values_supported': [],

              'request_object_encryption_enc_values_supported': [],

              'token_endpoint_auth_methods_supported': [

file modified
+1
@@ -40,6 +40,7 @@ 

  

  sp_a = {'hostname': '${ADDRESS}',

          'saml_idp_metadata':

+             # noqa (pep8 E126)

              'https://%s:45080/idp1/saml2/metadata' % WRAP_HOSTNAME,

          'saml_auth': '/sp',

          'httpd_user': '${TEST_USER}'}

These PEP-8 errors are caused by an extra indent for dict values.
We would like to do indent these extra to indicate they are not just another
key in the dict, but pep8 on EL7 does not accept this style, because it thinks
that we are in a function definition.

Let's just ignore these couple of lines for now.

Signed-off-by: Patrick Uiterwijk puiterwijk@redhat.com

rebased

7 years ago

rebased

7 years ago

Pull-Request has been merged by puiterwijk

7 years ago