From e73d1e9a2d810f4e94c19fe5a49fc5bb7a66f1d7 Mon Sep 17 00:00:00 2001
From: Bill Mitchell <wsmitchell3@gmail.com>
Date: Thu, 8 Feb 2018 14:55:05 -0600
Subject: [PATCH] Moved unsupported format list to larger scope, use the
 dictionary keys to test if a packet is in the unsupported list.

---
 aprslib/parsing/__init__.py | 62 +++++++++++++------------------------
 1 file changed, 21 insertions(+), 41 deletions(-)

diff --git a/aprslib/parsing/__init__.py b/aprslib/parsing/__init__.py
index 858f955..c2eae9a 100644
--- a/aprslib/parsing/__init__.py
+++ b/aprslib/parsing/__init__.py
@@ -43,6 +43,26 @@ from aprslib.parsing.message import *
 from aprslib.parsing.telemetry import *
 from aprslib.parsing.weather import *
 
+unsupported_formats = {
+        '#':'raw weather report',
+        '$':'raw gps',
+        '%':'agrelo',
+        '&':'reserved',
+        '(':'unused',
+        ')':'item report',
+        '*':'complete weather report',
+        '+':'reserved',
+        '-':'unused',
+        '.':'reserved',
+        '<':'station capabilities',
+        '?':'general query format',
+        'T':'telemetry report',
+        '[':'maidenhead locator beacon',
+        '\\':'unused',
+        ']':'unused',
+        '^':'unused',
+        '}':'3rd party traffic'
+}
 
 def _unicode_packet(packet):
     # attempt utf-8
@@ -138,47 +158,7 @@ def parse(packet):
 def _try_toparse_body(packet_type, body, parsed):
     result = {}
 
-    unsupported_formats = {
-            '#':'raw weather report',
-            '$':'raw gps',
-            '%':'agrelo',
-            '&':'reserved',
-            '(':'unused',
-            ')':'item report',
-            '*':'complete weather report',
-            '+':'reserved',
-            '-':'unused',
-            '.':'reserved',
-            '<':'station capabilities',
-            '?':'general query format',
-            'T':'telemetry report',
-            '[':'maidenhead locator beacon',
-            '\\':'unused',
-            ']':'unused',
-            '^':'unused',
-            '}':'3rd party traffic'
-    }
-    # NOT SUPPORTED FORMATS
-    #
-    # # - raw weather report
-    # $ - raw gps
-    # % - agrelo
-    # & - reserved
-    # ( - unused
-    # ) - item report
-    # * - complete weather report
-    # + - reserved
-    # - - unused
-    # . - reserved
-    # < - station capabilities
-    # ? - general query format
-    # T - telemetry report
-    # [ - maidenhead locator beacon
-    # \ - unused
-    # ] - unused
-    # ^ - unused
-    # } - 3rd party traffic
-    if packet_type in '#$%)*<?T[}':
+    if packet_type in unsupported_formats:
         raise UnknownFormat('format is not supported: {0}'.format(unsupported_formats[packet_type]))
 
     # user defined