pep8

datosgobar · Oct 21, 2019 · 5881dfc · 5881dfc
1 parent a765f11
commit 5881dfc
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 21 deletions.
diff --git a/pydatajson/catalog_readme.py b/pydatajson/catalog_readme.py
@@ -23,7 +23,8 @@
 TEMPLATES_PATH = os.path.join(ABSOLUTE_PROJECT_DIR, "templates")
 
 
-def generate_catalog_readme(_datajson, catalog, export_path=None, verify_ssl=True):
+def generate_catalog_readme(_datajson, catalog,
+                            export_path=None, verify_ssl=True):
     """Este método está para mantener retrocompatibilidad con versiones
     anteriores. Se ignora el argumento _data_json."""
     return generate_readme(catalog, export_path, verify_ssl=verify_ssl)

diff --git a/pydatajson/core.py b/pydatajson/core.py
@@ -967,7 +967,8 @@ def generate_catalogs_indicators(self, catalogs=None,
         catalogs = catalogs or self
         return indicators.generate_catalogs_indicators(
             catalogs, central_catalog, identifier_search=identifier_search,
-            validator=self.validator, broken_links=broken_links, verify_ssl=self.verify_ssl)
+            validator=self.validator, broken_links=broken_links,
+            verify_ssl=self.verify_ssl)
 
     def _count_fields_recursive(self, dataset, fields):
         """Cuenta la información de campos optativos/recomendados/requeridos

diff --git a/pydatajson/indicators.py b/pydatajson/indicators.py
@@ -300,7 +300,9 @@ def _generate_status_indicators(catalog, validator=None, verify_ssl=True):
         'datasets_con_datos_pct': None
     }
     try:
-        generator = StatusIndicatorsGenerator(catalog, validator=validator, verify_ssl=verify_ssl)
+        generator = StatusIndicatorsGenerator(catalog,
+                                              validator=validator,
+                                              verify_ssl=verify_ssl)
     except Exception as e:
         msg = u'Error generando resumen del catálogo {}: {}'.format(
             catalog['title'], str(e))
@@ -572,7 +574,10 @@ def _generate_valid_urls_indicators(catalog, validator=None, verify_ssl=True):
 
     result = {}
     try:
-        generator = StatusIndicatorsGenerator(catalog, validator=validator, verify_ssl=verify_ssl)
+        generator = \
+            StatusIndicatorsGenerator(catalog,
+                                      validator=validator,
+                                      verify_ssl=verify_ssl)
     except Exception as e:
         msg = u'Error generando resumen del catálogo {}: {}'.format(
             catalog['title'], str(e))

diff --git a/pydatajson/status_indicators_generator.py b/pydatajson/status_indicators_generator.py
@@ -1,6 +1,8 @@
 from pydatajson.readers import read_catalog
 from pydatajson.reporting import generate_datasets_summary
-from pydatajson.validators.distribution_download_urls_validator import DistributionDownloadUrlsValidator
+from pydatajson.validators\
+    .distribution_download_urls_validator \
+    import DistributionDownloadUrlsValidator
 
 
 class StatusIndicatorsGenerator(object):

diff --git a/pydatajson/validation.py b/pydatajson/validation.py
@@ -54,11 +54,15 @@ def init_jsonschema_validator(self, schema_dir, schema_filename):
             schema=schema, resolver=resolver, format_checker=format_checker)
 
     def is_valid(self, catalog, broken_links=False, verify_ssl=True):
-        return not self._get_errors(catalog, broken_links=broken_links, verify_ssl=verify_ssl)
+        return not self._get_errors(catalog,
+                                    broken_links=broken_links,
+                                    verify_ssl=verify_ssl)
 
-    def validate_catalog(self, catalog, only_errors=False, broken_links=False, verify_ssl=True):
+    def validate_catalog(self, catalog, only_errors=False,
+                         broken_links=False, verify_ssl=True):
         default_response = self._default_response(catalog)
-        errors = self._get_errors(catalog, broken_links=broken_links, verify_ssl=verify_ssl)
+        errors = self._get_errors(catalog, broken_links=broken_links,
+                                  verify_ssl=verify_ssl)
 
         response = default_response.copy()
         for error in errors:
@@ -254,4 +258,6 @@ def validate_catalog(catalog, only_errors=False, fmt="dict",
         else:
             validator = Validator()
 
-    return validator.validate_catalog(catalog, only_errors, verify_ssl=verify_ssl)
+    return validator.validate_catalog(catalog,
+                                      only_errors,
+                                      verify_ssl=verify_ssl)
diff --git a/pydatajson/validators/theme_ids_not_repeated_validator.py b/pydatajson/validators/theme_ids_not_repeated_validator.py
@@ -10,7 +10,8 @@ class ThemeIdsNotRepeatedValidator(SimpleValidator):
 
     def validate(self):
         if "themeTaxonomy" in self.catalog:
-            theme_ids = [theme["id"] for theme in self.catalog["themeTaxonomy"]]
+            theme_ids = [theme["id"]
+                         for theme in self.catalog["themeTaxonomy"]]
             dups = self._find_dups(theme_ids)
             if len(dups) > 0:
                 yield ce.ThemeIdRepeated(dups)

diff --git a/pydatajson/validators/url_validator.py b/pydatajson/validators/url_validator.py
@@ -5,7 +5,8 @@
 import requests
 from requests import RequestException, Timeout
 
-from pydatajson.constants import EXCEPTION_STATUS_CODES, INVALID_STATUS_CODES_REGEX
+from pydatajson.constants import EXCEPTION_STATUS_CODES, \
+    INVALID_STATUS_CODES_REGEX
 from pydatajson.validators.simple_validator import SimpleValidator
 
 

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -566,7 +566,8 @@ def test_generate_datasets_summary(self):
                                "several_datasets_for_harvest.json")
 
         with mock.patch(
-                'pydatajson.validators.url_validator.UrlValidator.is_working_url',
+                'pydatajson.validators.url_validator'
+                '.UrlValidator.is_working_url',
                 return_value=(True, 200)):
             actual = self.dj.generate_datasets_summary(catalog)
 

diff --git a/tests/test_status_indicators_generator.py b/tests/test_status_indicators_generator.py
@@ -24,7 +24,8 @@ def get_sample(cls, sample_filename):
     @classmethod
     def setUpClass(cls):
         with mock.patch(
-                'pydatajson.validators.url_validator.UrlValidator.is_working_url',
+                'pydatajson.validators'
+                '.url_validator.UrlValidator.is_working_url',
                 return_value=(True, 200)):
             cls.gen_justicia = StatusIndicatorsGenerator(
                 cls.get_sample('catalogo_justicia.json'))

diff --git a/tests/test_validators.py b/tests/test_validators.py
@@ -9,10 +9,15 @@
 import requests_mock
 from requests import Timeout, ConnectionError
 
-from pydatajson.validators.consistent_distribution_fields_validator import ConsistentDistributionFieldsValidator
-from pydatajson.validators.distribution_urls_validator import DistributionUrlsValidator
-from pydatajson.validators.landing_pages_validator import LandingPagesValidator
-from pydatajson.validators.theme_ids_not_repeated_validator import ThemeIdsNotRepeatedValidator
+from pydatajson.validators \
+    .consistent_distribution_fields_validator \
+    import ConsistentDistributionFieldsValidator
+from pydatajson.validators.distribution_urls_validator \
+    import DistributionUrlsValidator
+from pydatajson.validators.landing_pages_validator \
+    import LandingPagesValidator
+from pydatajson.validators.theme_ids_not_repeated_validator \
+    import ThemeIdsNotRepeatedValidator
 from pydatajson.validators.url_validator import UrlValidator
 
 try:
@@ -96,7 +101,9 @@ def test_valid_landing_page_validator(self):
         lp_validator = \
             LandingPagesValidator(self.catalog, True)
         with mock.patch(
-                'pydatajson.validators.url_validator.UrlValidator.is_working_url',
+                'pydatajson'
+                '.validators'
+                '.url_validator.UrlValidator.is_working_url',
                 return_value=(True, 200)):
             res = lp_validator.validate()
             self.assertEqual(0, len(list(res)))
@@ -105,7 +112,9 @@ def test_invalid_landing_page_validator(self):
         lp_validator = \
             LandingPagesValidator(self.catalog, True)
         with mock.patch(
-                'pydatajson.validators.url_validator.UrlValidator.is_working_url',
+                'pydatajson'
+                '.validators'
+                '.url_validator.UrlValidator.is_working_url',
                 return_value=(False, 400)):
             res = lp_validator.validate()
             self.assertNotEqual(0, len(list(res)))
@@ -114,7 +123,9 @@ def test_valid_distribution_url_validator(self):
         ddu_validator = \
             DistributionUrlsValidator(self.catalog, True)
         with mock.patch(
-                'pydatajson.validators.url_validator.UrlValidator.is_working_url',
+                'pydatajson'
+                '.validators'
+                '.url_validator.UrlValidator.is_working_url',
                 return_value=(True, 200)):
             res = ddu_validator.validate()
             self.assertEqual(0, len(list(res)))
@@ -123,7 +134,9 @@ def test_invalid_distribution_url_validator(self):
         ddu_validator = \
             DistributionUrlsValidator(self.catalog, True)
         with mock.patch(
-                'pydatajson.validators.url_validator.UrlValidator.is_working_url',
+                'pydatajson'
+                '.validators'
+                '.url_validator.UrlValidator.is_working_url',
                 return_value=(False, 400)):
             res = ddu_validator.validate()
             self.assertNotEqual(0, len(list(res)))