diff --git a/mapstore2_adapter/__init__.py b/mapstore2_adapter/__init__.py index 7932fef..6339c56 100644 --- a/mapstore2_adapter/__init__.py +++ b/mapstore2_adapter/__init__.py @@ -31,7 +31,7 @@ def fixup_map(map_id): _mm, _created = MapStoreResource.objects.get_or_create(id=_m.id, user_id=_u.id) if _created: _mm.save() - except BaseException as e: + except Exception as e: logger.exception(e) diff --git a/mapstore2_adapter/api/models.py b/mapstore2_adapter/api/models.py index 87058ce..4da9a3f 100644 --- a/mapstore2_adapter/api/models.py +++ b/mapstore2_adapter/api/models.py @@ -50,7 +50,7 @@ class MapStoreResource(models.Model): related_name="data", null=True, blank=True, - on_delete="CASCASE") + on_delete=models.CASCADE) attributes = models.ManyToManyField( "MapStoreAttribute", related_name="attributes", diff --git a/mapstore2_adapter/api/serializers.py b/mapstore2_adapter/api/serializers.py index 2abacd4..993c4ed 100644 --- a/mapstore2_adapter/api/serializers.py +++ b/mapstore2_adapter/api/serializers.py @@ -33,7 +33,7 @@ def to_representation(self, value): return value.blob # try: # return json.loads(value) - except BaseException: + except Exception: return value diff --git a/mapstore2_adapter/plugins/geonode.py b/mapstore2_adapter/plugins/geonode.py index 2d7b6b6..9103a8a 100644 --- a/mapstore2_adapter/plugins/geonode.py +++ b/mapstore2_adapter/plugins/geonode.py @@ -63,7 +63,7 @@ def convert(self, viewer, request): if 'id' in viewer_obj and viewer_obj['id']: try: map_id = int(viewer_obj['id']) - except BaseException: + except Exception: pass data = {} @@ -144,7 +144,7 @@ def convert(self, viewer, request): 'base.delete_resourcebase', _PERMISSION_MSG_DELETE): info['canDelete'] = True - except BaseException: + except Exception: tb = traceback.format_exc() logger.debug(tb) else: @@ -176,7 +176,7 @@ def convert(self, viewer, request): 'base.delete_resourcebase', _PERMISSION_MSG_DELETE): info['canDelete'] = True - except BaseException: + except Exception: tb = traceback.format_exc() logger.debug(tb) @@ -185,7 +185,7 @@ def convert(self, viewer, request): ms2_map['layers'].append(overlay) data['map'] = ms2_map - except BaseException: + except Exception: # traceback.print_exc() tb = traceback.format_exc() logger.debug(tb) @@ -196,7 +196,7 @@ def convert(self, viewer, request): ms2_catalogue['selectedService'] = CATALOGUE_SELECTED_SERVICE ms2_catalogue['services'] = CATALOGUE_SERVICES data['catalogServices'] = ms2_catalogue - except BaseException: + except Exception: # traceback.print_exc() tb = traceback.format_exc() logger.debug(tb) @@ -214,7 +214,7 @@ def convert(self, viewer, request): if 'map' in ms2_map_data: del ms2_map_data['map'] data.update(ms2_map_data) - except BaseException: + except Exception: # traceback.print_exc() tb = traceback.format_exc() logger.debug(tb) @@ -255,7 +255,7 @@ def getBackgrounds(self, viewer, defaults): break else: backgrounds = copy.deepcopy(defaults) - except BaseException: + except Exception: # traceback.print_exc() backgrounds = copy.copy(defaults) tb = traceback.format_exc() @@ -372,7 +372,7 @@ def get_overlays(self, viewer, request=None): alternate=overlay['name']) if _gn_layer.srid: overlay['nativeCrs'] = _gn_layer.srid - except BaseException: + except Exception: tb = traceback.format_exc() logger.debug(tb) @@ -427,7 +427,7 @@ def get_overlays(self, viewer, request=None): overlays.append(overlay) if not selected or ('selected' in layer and layer['selected']): selected = overlay - except BaseException: + except Exception: tb = traceback.format_exc() logger.debug(tb) @@ -498,12 +498,12 @@ def project_to_WGS84(self, ov_bbox, ov_crs, center=None): "crs": "EPSG:4326" } zoom = GoogleZoom().get_zoom(poly) + 1 - except BaseException: + except Exception: center = (0, 0) zoom = 0 tb = traceback.format_exc() logger.debug(tb) - except BaseException: + except Exception: tb = traceback.format_exc() logger.debug(tb) diff --git a/mapstore2_adapter/plugins/serializers.py b/mapstore2_adapter/plugins/serializers.py index 3820d6b..77fa456 100644 --- a/mapstore2_adapter/plugins/serializers.py +++ b/mapstore2_adapter/plugins/serializers.py @@ -81,7 +81,7 @@ def get_queryset(self, caller, queryset): _PERMISSION_MSG_VIEW) if map_obj: allowed_map_ids.append(mapid) - except BaseException: + except Exception: tb = traceback.format_exc() logger.debug(tb) @@ -100,7 +100,7 @@ def get_geonode_map(self, caller, serializer): 'base.change_resourcebase', _PERMISSION_MSG_SAVE) return map_obj - except BaseException: + except Exception: tb = traceback.format_exc() logger.debug(tb) raise APIException(_PERMISSION_MSG_SAVE) @@ -168,12 +168,12 @@ def decode_base64(data): _url = urlparse(_lyr['catalogURL']) _lyr_store = Layer.objects.get( uuid=parse_qs(_url.query)['id'][0]).store - except BaseException: + except Exception: try: _lyr_store = Layer.objects.get( alternate=_lyr['name'], remote_service__base_url=_lyr['url']).store - except BaseException: + except Exception: _lyr_store = None _lyr_name = "%s:%s" % (_lyr_store, _lyr['name']) if _lyr_store else _lyr['name'] @@ -195,7 +195,7 @@ def decode_base64(data): except Http404: tb = traceback.format_exc() logger.debug(tb) - except BaseException: + except Exception: raise # Store ms2 layer idq if "id" in _lyr and _lyr["id"]: @@ -286,7 +286,7 @@ def decode_base64(data): serializer.validated_data['id'] = map_obj.id serializer.save(user=caller.request.user) - except BaseException: + except Exception: tb = traceback.format_exc() logger.error(tb) raise APIException(tb) diff --git a/mapstore2_adapter/settings.py b/mapstore2_adapter/settings.py index 6fd8a47..e6680ba 100644 --- a/mapstore2_adapter/settings.py +++ b/mapstore2_adapter/settings.py @@ -14,12 +14,12 @@ try: settings.TEMPLATES[0]['OPTIONS']['context_processors'] += ['mapstore2_adapter.context_processors.resource_urls',] -except BaseException: +except Exception: pass try: settings.LOGGING["loggers"]["mapstore2_adapter"] = {"handlers": ["console"], "level": "INFO", } -except BaseException: +except Exception: pass settings.MAPSTORE2_ADAPTER_SERIALIZER = "mapstore2_adapter.plugins.serializers.GeoNodeSerializer" diff --git a/mapstore2_adapter/utils.py b/mapstore2_adapter/utils.py index 9154446..f1cb166 100644 --- a/mapstore2_adapter/utils.py +++ b/mapstore2_adapter/utils.py @@ -19,7 +19,7 @@ try: from urlparse import urljoin -except BaseException: +except Exception: # Python 3+ from urllib.parse import urljoin @@ -29,7 +29,7 @@ from django.utils.six.moves import range try: from django.urls import reverse -except BaseException: +except Exception: # Django 2.0 from django.urls import reverse from django.contrib.gis.geos import GEOSGeometry, LinearRing, Point, Polygon @@ -211,7 +211,7 @@ def get_wfs_endpoint(request): wfs_url = urljoin(settings.SITEURL, reverse('ows_endpoint')) else: wfs_url = urljoin(settings.SITEURL, reverse('ows_endpoint')) - except BaseException: + except Exception: wfs_url = urljoin(settings.SITEURL, reverse('ows_endpoint')) return wfs_url @@ -219,7 +219,7 @@ def get_wfs_endpoint(request): def get_valid_number(number, default=None, complementar=False): try: x = float(number) - except BaseException: + except Exception: x = float('nan') is_nan = isnan(x) is_inf = isinf(x)