From 01d559bac2b7f9f482e792aba1f834353d384cdf Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Wed, 15 Jul 2020 11:28:32 +0000 Subject: [PATCH] 'Refactored by Sourcery' --- fastkml/geometry.py | 2 +- fastkml/kml.py | 91 +++++++++++++++++++-------------------------- 2 files changed, 40 insertions(+), 53 deletions(-) diff --git a/fastkml/geometry.py b/fastkml/geometry.py index 53fd1b10..a731192b 100644 --- a/fastkml/geometry.py +++ b/fastkml/geometry.py @@ -395,7 +395,7 @@ def _get_multigeometry(self, element): for lr in linearings: self._get_geometry_spec(lr) geoms.append(LinearRing(self._get_coordinates(lr))) - if len(geoms) > 0: + if geoms: geom_types = [] for geom in geoms: geom_types.append(geom.geom_type) diff --git a/fastkml/kml.py b/fastkml/kml.py index e3016906..c92f58ce 100644 --- a/fastkml/kml.py +++ b/fastkml/kml.py @@ -78,10 +78,7 @@ def __init__(self, ns=None): """ self._features = [] - if ns is None: - self.ns = config.KMLNS - else: - self.ns = ns + self.ns = config.KMLNS if ns is None else ns def from_string(self, xml_string): """ create a KML object from a xml string""" @@ -309,10 +306,7 @@ def timeStamp(self): @timeStamp.setter def timeStamp(self, dt): - if dt is None: - self._time_stamp = None - else: - self._time_stamp = TimeStamp(timestamp=dt) + self._time_stamp = None if dt is None else TimeStamp(timestamp=dt) if self._time_span is not None: logger.warn('Setting a TimeStamp, TimeSpan deleted') self._time_span = None @@ -404,26 +398,27 @@ def styles(self): @property def snippet(self): - if self._snippet: - if isinstance(self._snippet, dict): - text = self._snippet.get('text') - if text: - if not (isinstance(text, basestring)): - raise TypeError("text should be of" - "type basestring") - max_lines = self._snippet.get('maxLines', None) - if max_lines is None: - return {'text': text} - elif int(max_lines) > 0: - # if maxLines <=0 ignore it - return {'text': text, 'maxLines': max_lines} - elif isinstance(self._snippet, basestring): - return self._snippet - else: - raise ValueError( - "Snippet must be dict of " - "{'text':t, 'maxLines':i} or string" - ) + if not self._snippet: + return + if isinstance(self._snippet, dict): + text = self._snippet.get('text') + if text: + if not (isinstance(text, basestring)): + raise TypeError("text should be of" + "type basestring") + max_lines = self._snippet.get('maxLines', None) + if max_lines is None: + return {'text': text} + elif int(max_lines) > 0: + # if maxLines <=0 ignore it + return {'text': text, 'maxLines': max_lines} + elif isinstance(self._snippet, basestring): + return self._snippet + else: + raise ValueError( + "Snippet must be dict of " + "{'text':t, 'maxLines':i} or string" + ) @snippet.setter def snippet(self, snip=None): @@ -530,16 +525,10 @@ def from_element(self, element): self.description = description.text visibility = element.find('%svisibility' % self.ns) if visibility is not None: - if visibility.text in ['1', 'true']: - self.visibility = 1 - else: - self.visibility = 0 + self.visibility = 1 if visibility.text in ['1', 'true'] else 0 isopen = element.find('%sopen' % self.ns) if isopen is not None: - if isopen.text in ['1', 'true']: - self.isopen = 1 - else: - self.isopen = 0 + self.isopen = 1 if isopen.text in ['1', 'true'] else 0 styles = element.findall('%sStyle' % self.ns) for style in styles: s = Style(self.ns) @@ -645,7 +634,7 @@ def append(self, kmlobj): "Features must be instances of " "(Folder, Placemark, Document)" ) - if not (kmlobj != self): + if kmlobj == self: raise AssertionError(" kml object should not be instance of class" "(self)") @@ -977,8 +966,7 @@ class Document(_Container): def schemata(self): if self._schemata: - for schema in self._schemata: - yield schema + yield from self._schemata def append_schema(self, schema): if self._schemata is None: @@ -1167,7 +1155,7 @@ def parse_str(self, datestr): year = int(datestr.split('-')[0]) month = int(datestr.split('-')[1]) dt = datetime(year, month, day) - elif len(datestr) == 8 or len(datestr) == 10: + elif len(datestr) in [8, 10]: resolution = 'date' dt = dateutil.parser.parse(datestr) elif len(datestr) > 10: @@ -1286,14 +1274,16 @@ def __init__(self, ns=None, id=None, name=None, fields=None): @property def simple_fields(self): - sfs = [] - for simple_field in self._simple_fields: - if simple_field.get('type') and simple_field.get('name'): - sfs.append({ - 'type': simple_field['type'], - 'name': simple_field['name'], - 'displayName': simple_field.get('displayName') - }) + sfs = [ + { + 'type': simple_field['type'], + 'name': simple_field['name'], + 'displayName': simple_field.get('displayName'), + } + for simple_field in self._simple_fields + if simple_field.get('type') and simple_field.get('name') + ] + return tuple(sfs) @simple_fields.setter @@ -1358,10 +1348,7 @@ def from_element(self, element): sfname = simple_field.get('name') sftype = simple_field.get('type') display_name = simple_field.find('%sdisplayName' % self.ns) - if display_name is not None: - sfdisplay_name = display_name.text - else: - sfdisplay_name = None + sfdisplay_name = display_name.text if display_name is not None else None self.append(sftype, sfname, sfdisplay_name) def etree_element(self):