From 564031ffd392816b9391b9a41a260638ee3ad65f Mon Sep 17 00:00:00 2001
From: cintom00 <tom.cinbis@unibas.ch>
Date: Sun, 4 Feb 2018 10:33:54 +0100
Subject: [PATCH] Changed exception handling and removed whitespaces

The whitespaces which were removed and messed up the git history were
added again.
Instead of catching all exceptions, we just now just catch the
IndexError.
---
 README.md     |  2 +-
 micropyGPS.py | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 97b8fe0..b1e308d 100644
--- a/README.md
+++ b/README.md
@@ -217,7 +217,7 @@ Beyond the pyBoard and ESP32, micropyGPS should run on other embedded platforms
 [Micropython]:https://micropython.org/
 [frozen module]:https://learn.adafruit.com/micropython-basics-loading-modules/frozen-modules
 [NMEA-0183]:http://aprs.gids.nl/nmea/
-[TinyGPS]:http://arduiniana.org/libraries/tinygps/
+[TinyGPS]:http://arduiniana.org/libraries/tinygps/ 
 [pyboard]:http://docs.micropython.org/en/latest/pyboard/pyboard/quickref.html
 [MTK_command]:https://github.com/inmcm/MTK_commands
 [Ultimate GPS Breakout]:http://www.adafruit.com/product/746
diff --git a/micropyGPS.py b/micropyGPS.py
index a4ce284..75345c3 100644
--- a/micropyGPS.py
+++ b/micropyGPS.py
@@ -495,32 +495,23 @@ class MicropyGPS(object):
             if self.gps_segments[sats]:
                 try:
                     sat_id = int(self.gps_segments[sats])
-                except ValueError:
-                    return False
-                except Exception:
+                except (ValueError,IndexError):
                     return False
 
                 try:  # elevation can be null (no value) when not tracking
                     elevation = int(self.gps_segments[sats+1])
-                except ValueError:
-                    elevation = None
-                except Exception:
+                except (ValueError,IndexError):
                     elevation = None
 
                 try:  # azimuth can be null (no value) when not tracking
                     azimuth = int(self.gps_segments[sats+2])
-                except ValueError:
-                    azimuth = None
-                except Exception:
+                except (ValueError,IndexError):
                     azimuth = None
 
                 try:  # SNR can be null (no value) when not tracking
                     snr = int(self.gps_segments[sats+3])
-                except ValueError:
+                except (ValueError,IndexError):
                     snr = None
-                except Exception:
-                    snr = None
-
             # If no PRN is found, then the sentence has no more satellites to read
             else:
                 break