[Fix] Fix regression #62

Author: philippelt

lnetatmo.py

@@ -384,15 +384,21 @@ def modulesNamesList(self, station=None, home=None):
         res.append(self.stationByName(station)['module_name'])
         return res
 
-    def stationByName(self, station=None):
+    # Both functions (byName and byStation) are here for historical reason,
+    # considering that chances are low that a station name could be confused with a station ID,
+    # there should be in fact a single function for getting station data
+
+    def getStation(self, station=None):
         if not station : station = self.default_station
-        if station not in self.stations : return None
-        return self.stations[station]
+        if station in self.stations : return self.stations[station]
+        if station in self.stationIds : return self.stationIds[station]
+        return None
 
+    # Functions for compatibility with previous versions
+    def stationByName(self, station=None):
+        return self.getStation(station)
     def stationById(self, sid):
-        if not sid : return self.stations[self.default_station]
-        if sid not in self.stationIds : return None
-        return self.stationIds[sid]
+        return self.getStation(sid)
 
     def moduleByName(self, module):
         for m in self.modules:

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='lnetatmo',
-    version='3.2.1',
+    version='3.3.0',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
@@ -17,7 +17,7 @@
     scripts=[],
     data_files=[],
     url='https://github.com/philippelt/netatmo-api-python',
-    download_url='https://github.com/philippelt/netatmo-api-python/archive/v3.2.1.tar.gz',
+    download_url='https://github.com/philippelt/netatmo-api-python/archive/v3.3.0.tar.gz',
     license='GPL V3',
     description='Simple API to access Netatmo weather station data from any python script.'
 )

usage.md

@@ -252,6 +252,10 @@ Properties, all properties are read-only unless specified:
 Methods :
 
 
+  * **getStation** (station=None) : Find a station by it's station name or station ID
+    * Input : Station name or ID to lookup (str)
+    * Output : station dictionary or None
+
   * **stationByName** (station=None) : Find a station by it's station name
     * Input : Station name to lookup (str)
     * Output : station dictionary or None