Merge remote-tracking branch 'origin/master'

# Conflicts:
#	city_model_structure/attributes/concordia_energy_sensor.py

city_model_structure/attributes/sensor.py

@@ -4,6 +4,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
+
 class Sensor:
   """
   Sensor abstract class
@@ -42,7 +43,6 @@ class Sensor:
     """
     return self._units
 
-
   @property
   def location(self):
     """
@@ -50,7 +50,6 @@ class Sensor:
     """
     return self._location
 
-
   @location.setter
   def location(self, value):
     """

imports/sensors/concordia_energy_consumption.py

@@ -81,7 +81,7 @@ class ConcordiaEnergyConsumption:
     fields = line.split(',')
     date = fields[0]
     time = fields[1]
-    if '<>'in date:
+    if '<>' in date:
       return line.replace(f'{date},{time}', 'Date time')
     else:
       date_fields = date.split('/')