[chirp_devel] [PATCH 21/22] Fix style issues in fips.py (#2355)

Zach Welch
Sat Feb 28 22:54:58 PST 2015


# HG changeset patch
# User Zach Welch <zach at mandolincreekfarm.com>
# Fake Node ID 03723ca82ed1e29d662e070e22db3601daa9e215

Fix style issues in fips.py (#2355)


diff --git a/chirpui/fips.py b/chirpui/fips.py
index 0094ec1..a7089e7 100644
--- a/chirpui/fips.py
+++ b/chirpui/fips.py
@@ -15,77 +15,77 @@
 
 
 FIPS_STATES = {
-    "Alaska"               : 2,
-    "Alabama"              : 1,
-    "Arkansas"             : 5,
-    "Arizona"              : 4,
-    "California"           : 6,
-    "Colorado"             : 8,
-    "Connecticut"          : 9,
-    "District of Columbia" : 11,
-    "Delaware"             : 10,
-    "Florida"              : 12,
-    "Georgia"              : 13,
-    "Guam"                 : 66,
-    "Hawaii"               : 15,
-    "Iowa"                 : 19,
-    "Idaho"                : 16,
-    "Illinois"             : 17,
-    "Indiana"              : 18,
-    "Kansas"               : 20,
-    "Kentucky"             : 21,
-    "Louisiana"            : 22,
-    "Massachusetts"        : 25,
-    "Maryland"             : 24,
-    "Maine"                : 23,
-    "Michigan"             : 26,
-    "Minnesota"            : 27,
-    "Missouri"             : 29,
-    "Mississippi"          : 28,
-    "Montana"              : 30,
-    "North Carolina"       : 37,
-    "North Dakota"         : 38,
-    "Nebraska"             : 31,
-    "New Hampshire"        : 33,
-    "New Jersey"           : 34,
-    "New Mexico"           : 35,
-    "Nevada"               : 32,
-    "New York"             : 36,
-    "Ohio"                 : 39,
-    "Oklahoma"             : 40,
-    "Oregon"               : 41,
-    "Pennsylvania"         : 42,
-    "Puerto Rico"          : 72,
-    "Rhode Island"         : 44,
-    "South Carolina"       : 45,
-    "South Dakota"         : 46,
-    "Tennessee"            : 47,
-    "Texas"                : 48,
-    "Utah"                 : 49,
-    "Virginia"             : 51,
-    "Virgin Islands"       : 78,
-    "Vermont"              : 50,
-    "Washington"           : 53,
-    "Wisconsin"            : 55,
-    "West Virginia"        : 54,
-    "Wyoming"              : 56,
-    "Alberta"              : "CA01",
-    "British Columbia"     : "CA02",
-    "Manitoba"             : "CA03",
-    "New Brunswick"        : "CA04",
+    "Alaska":                    2,
+    "Alabama":                   1,
+    "Arkansas":                  5,
+    "Arizona":                   4,
+    "California":                6,
+    "Colorado":                  8,
+    "Connecticut":               9,
+    "District of Columbia":      11,
+    "Delaware":                  10,
+    "Florida":                   12,
+    "Georgia":                   13,
+    "Guam":                      66,
+    "Hawaii":                    15,
+    "Iowa":                      19,
+    "Idaho":                     16,
+    "Illinois":                  17,
+    "Indiana":                   18,
+    "Kansas":                    20,
+    "Kentucky":                  21,
+    "Louisiana":                 22,
+    "Massachusetts":             25,
+    "Maryland":                  24,
+    "Maine":                     23,
+    "Michigan":                  26,
+    "Minnesota":                 27,
+    "Missouri":                  29,
+    "Mississippi":               28,
+    "Montana":                   30,
+    "North Carolina":            37,
+    "North Dakota":              38,
+    "Nebraska":                  31,
+    "New Hampshire":             33,
+    "New Jersey":                34,
+    "New Mexico":                35,
+    "Nevada":                    32,
+    "New York":                  36,
+    "Ohio":                      39,
+    "Oklahoma":                  40,
+    "Oregon":                    41,
+    "Pennsylvania":              42,
+    "Puerto Rico":               72,
+    "Rhode Island":              44,
+    "South Carolina":            45,
+    "South Dakota":              46,
+    "Tennessee":                 47,
+    "Texas":                     48,
+    "Utah":                      49,
+    "Virginia":                  51,
+    "Virgin Islands":            78,
+    "Vermont":                   50,
+    "Washington":                53,
+    "Wisconsin":                 55,
+    "West Virginia":             54,
+    "Wyoming":                   56,
+    "Alberta":                   "CA01",
+    "British Columbia":          "CA02",
+    "Manitoba":                  "CA03",
+    "New Brunswick":             "CA04",
     "Newfoundland and Labrador": "CA05",
-    "Northwest Territories": "CA13",
-    "Nova Scotia"          : "CA07",
-    "Nunavut"              : "CA14",
-    "Ontario"              : "CA08",
-    "Prince Edward Island" : "CA09",
-    "Quebec"               : "CA10",
-    "Saskatchewan"         : "CA11",
-    "Yukon"                : "CA12",
+    "Northwest Territories":     "CA13",
+    "Nova Scotia":               "CA07",
+    "Nunavut":                   "CA14",
+    "Ontario":                   "CA08",
+    "Prince Edward Island":      "CA09",
+    "Quebec":                    "CA10",
+    "Saskatchewan":              "CA11",
+    "Yukon":                     "CA12",
 }
 
 FIPS_COUNTIES = {
-  1: { '--All--': '%',
+  1:  {'--All--': '%',
        'Autauga County, AL': '001',
        'Baldwin County, AL': '003',
        'Barbour County, AL': '005',
@@ -153,7 +153,7 @@ FIPS_COUNTIES = {
        'Washington County, AL': '129',
        'Wilcox County, AL': '131',
        'Winston County, AL': '133'},
-  2: { '--All--': '%',
+  2:  {'--All--': '%',
        'Aleutians East Borough, AK': '013',
        'Aleutians West Census Area, AK': '016',
        'Anchorage Borough/municipality, AK': '020',
@@ -181,7 +181,7 @@ FIPS_COUNTIES = {
        'Wrangell-Petersburg Census Area, AK': '280',
        'Yakutat Borough, AK': '282',
        'Yukon-Koyukuk Census Area, AK': '290'},
-  4: { '--All--': '%',
+  4:  {'--All--': '%',
        'Apache County, AZ': '001',
        'Cochise County, AZ': '003',
        'Coconino County, AZ': '005',
@@ -197,7 +197,7 @@ FIPS_COUNTIES = {
        'Santa Cruz County, AZ': '023',
        'Yavapai County, AZ': '025',
        'Yuma County, AZ': '027'},
-  5: { '--All--': '%',
+  5:  {'--All--': '%',
        'Arkansas County, AR': '001',
        'Ashley County, AR': '003',
        'Baxter County, AR': '005',
@@ -273,7 +273,7 @@ FIPS_COUNTIES = {
        'White County, AR': '145',
        'Woodruff County, AR': '147',
        'Yell County, AR': '149'},
-  6: { '--All--': '%',
+  6:  {'--All--': '%',
        'Alameda County, CA': '001',
        'Alpine County, CA': '003',
        'Amador County, CA': '005',
@@ -332,7 +332,7 @@ FIPS_COUNTIES = {
        'Ventura County, CA': '111',
        'Yolo County, CA': '113',
        'Yuba County, CA': '115'},
-  8: { '--All--': '%',
+  8:  {'--All--': '%',
        'Adams County, CO': '001',
        'Alamosa County, CO': '003',
        'Arapahoe County, CO': '005',
@@ -397,7 +397,7 @@ FIPS_COUNTIES = {
        'Washington County, CO': '121',
        'Weld County, CO': '123',
        'Yuma County, CO': '125'},
-  9: { '--All--': '%',
+  9:  {'--All--': '%',
        'Fairfield County, CT': '001',
        'Hartford County, CT': '003',
        'Litchfield County, CT': '005',
@@ -406,12 +406,12 @@ FIPS_COUNTIES = {
        'New London County, CT': '011',
        'Tolland County, CT': '013',
        'Windham County, CT': '015'},
-  10: { '--All--': '%',
+  10:  {'--All--': '%',
         'Kent County, DE': '001',
         'New Castle County, DE': '003',
         'Sussex County, DE': '005'},
-  11: { '--All--': '%', 'District of Columbia': '001'},
-  12: { '--All--': '%',
+  11:  {'--All--': '%', 'District of Columbia': '001'},
+  12:  {'--All--': '%',
         'Alachua County, FL': '001',
         'Baker County, FL': '003',
         'Bay County, FL': '005',
@@ -479,7 +479,7 @@ FIPS_COUNTIES = {
         'Wakulla County, FL': '129',
         'Walton County, FL': '131',
         'Washington County, FL': '133'},
-  13: { '--All--': '%',
+  13:  {'--All--': '%',
         'Appling County, GA': '001',
         'Atkinson County, GA': '003',
         'Bacon County, GA': '005',
@@ -639,12 +639,12 @@ FIPS_COUNTIES = {
         'Wilkes County, GA': '317',
         'Wilkinson County, GA': '319',
         'Worth County, GA': '321'},
-  15: { '--All--': '%',
+  15:  {'--All--': '%',
         'Hawaii County, HI': '001',
         'Honolulu County/city, HI': '003',
         'Kauai County, HI': '007',
         'Maui County, HI': '009'},
-  16: { '--All--': '%',
+  16:  {'--All--': '%',
         'Ada County, ID': '001',
         'Adams County, ID': '003',
         'Bannock County, ID': '005',
@@ -689,7 +689,7 @@ FIPS_COUNTIES = {
         'Twin Falls County, ID': '083',
         'Valley County, ID': '085',
         'Washington County, ID': '087'},
-  17: { '--All--': '%',
+  17:  {'--All--': '%',
         'Adams County, IL': '001',
         'Alexander County, IL': '003',
         'Bond County, IL': '005',
@@ -792,7 +792,7 @@ FIPS_COUNTIES = {
         'Williamson County, IL': '199',
         'Winnebago County, IL': '201',
         'Woodford County, IL': '203'},
-  18: { '--All--': '%',
+  18:  {'--All--': '%',
         'Adams County, IN': '001',
         'Allen County, IN': '003',
         'Bartholomew County, IN': '005',
@@ -885,7 +885,7 @@ FIPS_COUNTIES = {
         'Wells County, IN': '179',
         'White County, IN': '181',
         'Whitley County, IN': '183'},
-  19: { '--All--': '%',
+  19:  {'--All--': '%',
         'Adair County, IA': '001',
         'Adams County, IA': '003',
         'Allamakee County, IA': '005',
@@ -985,7 +985,7 @@ FIPS_COUNTIES = {
         'Woodbury County, IA': '193',
         'Worth County, IA': '195',
         'Wright County, IA': '197'},
-  20: { '--All--': '%',
+  20:  {'--All--': '%',
         'Allen County, KS': '001',
         'Anderson County, KS': '003',
         'Atchison County, KS': '005',
@@ -1091,7 +1091,7 @@ FIPS_COUNTIES = {
         'Wilson County, KS': '205',
         'Woodson County, KS': '207',
         'Wyandotte County, KS': '209'},
-  21: { '--All--': '%',
+  21:  {'--All--': '%',
         'Adair County, KY': '001',
         'Allen County, KY': '003',
         'Anderson County, KY': '005',
@@ -1212,7 +1212,7 @@ FIPS_COUNTIES = {
         'Whitley County, KY': '235',
         'Wolfe County, KY': '237',
         'Woodford County, KY': '239'},
-  22: { '--All--': '%',
+  22:  {'--All--': '%',
         'Acadia Parish, LA': '001',
         'Allen Parish, LA': '003',
         'Ascension Parish, LA': '005',
@@ -1277,7 +1277,7 @@ FIPS_COUNTIES = {
         'West Carroll Parish, LA': '123',
         'West Feliciana Parish, LA': '125',
         'Winn Parish, LA': '127'},
-  23: { '--All--': '%',
+  23:  {'--All--': '%',
         'Androscoggin County, ME': '001',
         'Aroostook County, ME': '003',
         'Cumberland County, ME': '005',
@@ -1294,7 +1294,7 @@ FIPS_COUNTIES = {
         'Waldo County, ME': '027',
         'Washington County, ME': '029',
         'York County, ME': '031'},
-  24: { '--All--': '%',
+  24:  {'--All--': '%',
         'Allegany County, MD': '001',
         'Anne Arundel County, MD': '003',
         'Baltimore County, MD': '005',
@@ -1319,7 +1319,7 @@ FIPS_COUNTIES = {
         'Washington County, MD': '043',
         'Wicomico County, MD': '045',
         'Worcester County, MD': '047'},
-  25: { '--All--': '%',
+  25:  {'--All--': '%',
         'Barnstable County, MA': '001',
         'Berkshire County, MA': '003',
         'Bristol County, MA': '005',
@@ -1334,7 +1334,7 @@ FIPS_COUNTIES = {
         'Plymouth County, MA': '023',
         'Suffolk County, MA': '025',
         'Worcester County, MA': '027'},
-  26: { '--All--': '%',
+  26:  {'--All--': '%',
         'Alcona County, MI': '001',
         'Alger County, MI': '003',
         'Allegan County, MI': '005',
@@ -1418,7 +1418,7 @@ FIPS_COUNTIES = {
         'Washtenaw County, MI': '161',
         'Wayne County, MI': '163',
         'Wexford County, MI': '165'},
-  27: { '--All--': '%',
+  27:  {'--All--': '%',
         'Aitkin County, MN': '001',
         'Anoka County, MN': '003',
         'Becker County, MN': '005',
@@ -1506,7 +1506,7 @@ FIPS_COUNTIES = {
         'Winona County, MN': '169',
         'Wright County, MN': '171',
         'Yellow Medicine County, MN': '173'},
-  28: { '--All--': '%',
+  28:  {'--All--': '%',
         'Adams County, MS': '001',
         'Alcorn County, MS': '003',
         'Amite County, MS': '005',
@@ -1589,7 +1589,7 @@ FIPS_COUNTIES = {
         'Winston County, MS': '159',
         'Yalobusha County, MS': '161',
         'Yazoo County, MS': '163'},
-  29: { '--All--': '%',
+  29:  {'--All--': '%',
         'Adair County, MO': '001',
         'Andrew County, MO': '003',
         'Atchison County, MO': '005',
@@ -1705,7 +1705,7 @@ FIPS_COUNTIES = {
         'Webster County, MO': '225',
         'Worth County, MO': '227',
         'Wright County, MO': '229'},
-  30: { '--All--': '%',
+  30:  {'--All--': '%',
         'Beaverhead County, MT': '001',
         'Big Horn County, MT': '003',
         'Blaine County, MT': '005',
@@ -1762,7 +1762,7 @@ FIPS_COUNTIES = {
         'Wheatland County, MT': '107',
         'Wibaux County, MT': '109',
         'Yellowstone County, MT': '111'},
-  31: { '--All--': '%',
+  31:  {'--All--': '%',
         'Adams County, NE': '001',
         'Antelope County, NE': '003',
         'Arthur County, NE': '005',
@@ -1856,7 +1856,7 @@ FIPS_COUNTIES = {
         'Webster County, NE': '181',
         'Wheeler County, NE': '183',
         'York County, NE': '185'},
-  32: { '--All--': '%',
+  32:  {'--All--': '%',
         'Carson City, NV': '510',
         'Churchill County, NV': '001',
         'Clark County, NV': '003',
@@ -1874,7 +1874,7 @@ FIPS_COUNTIES = {
         'Storey County, NV': '029',
         'Washoe County, NV': '031',
         'White Pine County, NV': '033'},
-  33: { '--All--': '%',
+  33:  {'--All--': '%',
         'Belknap County, NH': '001',
         'Carroll County, NH': '003',
         'Cheshire County, NH': '005',
@@ -1885,7 +1885,7 @@ FIPS_COUNTIES = {
         'Rockingham County, NH': '015',
         'Strafford County, NH': '017',
         'Sullivan County, NH': '019'},
-  34: { '--All--': '%',
+  34:  {'--All--': '%',
         'Atlantic County, NJ': '001',
         'Bergen County, NJ': '003',
         'Burlington County, NJ': '005',
@@ -1907,7 +1907,7 @@ FIPS_COUNTIES = {
         'Sussex County, NJ': '037',
         'Union County, NJ': '039',
         'Warren County, NJ': '041'},
-  35: { '--All--': '%',
+  35:  {'--All--': '%',
         'Bernalillo County, NM': '001',
         'Catron County, NM': '003',
         'Chaves County, NM': '005',
@@ -1941,7 +1941,7 @@ FIPS_COUNTIES = {
         'Torrance County, NM': '057',
         'Union County, NM': '059',
         'Valencia County, NM': '061'},
-  36: { '--All--': '%',
+  36:  {'--All--': '%',
         'Albany County, NY': '001',
         'Allegany County, NY': '003',
         'Bronx County, NY': '005',
@@ -2004,7 +2004,7 @@ FIPS_COUNTIES = {
         'Westchester County, NY': '119',
         'Wyoming County, NY': '121',
         'Yates County, NY': '123'},
-  37: { '--All--': '%',
+  37:  {'--All--': '%',
         'Alamance County, NC': '001',
         'Alexander County, NC': '003',
         'Alleghany County, NC': '005',
@@ -2105,7 +2105,7 @@ FIPS_COUNTIES = {
         'Wilson County, NC': '195',
         'Yadkin County, NC': '197',
         'Yancey County, NC': '199'},
-  38: { '--All--': '%',
+  38:  {'--All--': '%',
         'Adams County, ND': '001',
         'Barnes County, ND': '003',
         'Benson County, ND': '005',
@@ -2159,7 +2159,7 @@ FIPS_COUNTIES = {
         'Ward County, ND': '101',
         'Wells County, ND': '103',
         'Williams County, ND': '105'},
-  39: { '--All--': '%',
+  39:  {'--All--': '%',
         'Adams County, OH': '001',
         'Allen County, OH': '003',
         'Ashland County, OH': '005',
@@ -2248,7 +2248,7 @@ FIPS_COUNTIES = {
         'Williams County, OH': '171',
         'Wood County, OH': '173',
         'Wyandot County, OH': '175'},
-  40: { '--All--': '%',
+  40:  {'--All--': '%',
         'Adair County, OK': '001',
         'Alfalfa County, OK': '003',
         'Atoka County, OK': '005',
@@ -2326,7 +2326,7 @@ FIPS_COUNTIES = {
         'Washita County, OK': '149',
         'Woods County, OK': '151',
         'Woodward County, OK': '153'},
-  41: { '--All--': '%',
+  41:  {'--All--': '%',
         'Baker County, OR': '001',
         'Benton County, OR': '003',
         'Clackamas County, OR': '005',
@@ -2363,7 +2363,7 @@ FIPS_COUNTIES = {
         'Washington County, OR': '067',
         'Wheeler County, OR': '069',
         'Yamhill County, OR': '071'},
-  42: { '--All--': '%',
+  42:  {'--All--': '%',
         'Adams County, PA': '001',
         'Allegheny County, PA': '003',
         'Armstrong County, PA': '005',
@@ -2431,13 +2431,13 @@ FIPS_COUNTIES = {
         'Westmoreland County, PA': '129',
         'Wyoming County, PA': '131',
         'York County, PA': '133'},
-  44: { '--All--': '%',
+  44:  {'--All--': '%',
         'Bristol County, RI': '001',
         'Kent County, RI': '003',
         'Newport County, RI': '005',
         'Providence County, RI': '007',
         'Washington County, RI': '009'},
-  45: { '--All--': '%',
+  45:  {'--All--': '%',
         'Abbeville County, SC': '001',
         'Aiken County, SC': '003',
         'Allendale County, SC': '005',
@@ -2484,7 +2484,7 @@ FIPS_COUNTIES = {
         'Union County, SC': '087',
         'Williamsburg County, SC': '089',
         'York County, SC': '091'},
-  46: { '--All--': '%',
+  46:  {'--All--': '%',
         'Aurora County, SD': '003',
         'Beadle County, SD': '005',
         'Bennett County, SD': '007',
@@ -2551,7 +2551,7 @@ FIPS_COUNTIES = {
         'Walworth County, SD': '129',
         'Yankton County, SD': '135',
         'Ziebach County, SD': '137'},
-  47: { '--All--': '%',
+  47:  {'--All--': '%',
         'Anderson County, TN': '001',
         'Bedford County, TN': '003',
         'Benton County, TN': '005',
@@ -2647,7 +2647,7 @@ FIPS_COUNTIES = {
         'White County, TN': '185',
         'Williamson County, TN': '187',
         'Wilson County, TN': '189'},
-  48: { '--All--': '%',
+  48:  {'--All--': '%',
         'Anderson County, TX': '001',
         'Andrews County, TX': '003',
         'Angelina County, TX': '005',
@@ -2902,7 +2902,7 @@ FIPS_COUNTIES = {
         'Young County, TX': '503',
         'Zapata County, TX': '505',
         'Zavala County, TX': '507'},
-  49: { '--All--': '%',
+  49:  {'--All--': '%',
         'Beaver County, UT': '001',
         'Box Elder County, UT': '003',
         'Cache County, UT': '005',
@@ -2932,7 +2932,7 @@ FIPS_COUNTIES = {
         'Washington County, UT': '053',
         'Wayne County, UT': '055',
         'Weber County, UT': '057'},
-  50: { '--All--': '%',
+  50:  {'--All--': '%',
         'Addison County, VT': '001',
         'Bennington County, VT': '003',
         'Caledonia County, VT': '005',
@@ -2947,7 +2947,7 @@ FIPS_COUNTIES = {
         'Washington County, VT': '023',
         'Windham County, VT': '025',
         'Windsor County, VT': '027'},
-  51: { '--All--': '%',
+  51:  {'--All--': '%',
         'Accomack County, VA': '001',
         'Albemarle County, VA': '003',
         'Alexandria city, VA': '510',
@@ -3082,7 +3082,7 @@ FIPS_COUNTIES = {
         'Wise County, VA': '195',
         'Wythe County, VA': '197',
         'York County, VA': '199'},
-  53: { '--All--': '%',
+  53:  {'--All--': '%',
         'Adams County, WA': '001',
         'Asotin County, WA': '003',
         'Benton County, WA': '005',
@@ -3122,7 +3122,7 @@ FIPS_COUNTIES = {
         'Whatcom County, WA': '073',
         'Whitman County, WA': '075',
         'Yakima County, WA': '077'},
-  54: { '--All--': '%',
+  54:  {'--All--': '%',
         'Barbour County, WV': '001',
         'Berkeley County, WV': '003',
         'Boone County, WV': '005',
@@ -3178,7 +3178,7 @@ FIPS_COUNTIES = {
         'Wirt County, WV': '105',
         'Wood County, WV': '107',
         'Wyoming County, WV': '109'},
-  55: { '--All--': '%',
+  55:  {'--All--': '%',
         'Adams County, WI': '001',
         'Ashland County, WI': '003',
         'Barron County, WI': '005',
@@ -3251,7 +3251,7 @@ FIPS_COUNTIES = {
         'Waushara County, WI': '137',
         'Winnebago County, WI': '139',
         'Wood County, WI': '141'},
-  56: { '--All--': '%',
+  56:  {'--All--': '%',
         'Albany County, WY': '001',
         'Big Horn County, WY': '003',
         'Campbell County, WY': '005',
@@ -3275,7 +3275,7 @@ FIPS_COUNTIES = {
         'Uinta County, WY': '041',
         'Washakie County, WY': '043',
         'Weston County, WY': '045'},
-  72: { '--All--': '%',
+  72:  {'--All--': '%',
         'Adjuntas Municipio, PR': '001',
         'Aguada Municipio, PR': '003',
         'Aguadilla Municipio, PR': '005',
@@ -3354,7 +3354,7 @@ FIPS_COUNTIES = {
         'Villalba Municipio, PR': '149',
         'Yabucoa Municipio, PR': '151',
         'Yauco Municipio, PR': '153'},
-  '01': { 'Autauga County, AL': '001',
+  '01':  {'Autauga County, AL': '001',
           'Baldwin County, AL': '003',
           'Barbour County, AL': '005',
           'Bibb County, AL': '007',
@@ -3421,7 +3421,7 @@ FIPS_COUNTIES = {
           'Washington County, AL': '129',
           'Wilcox County, AL': '131',
           'Winston County, AL': '133'},
-  '02': { 'Aleutians East Borough, AK': '013',
+  '02':  {'Aleutians East Borough, AK': '013',
           'Aleutians West Census Area, AK': '016',
           'Anchorage Borough/municipality, AK': '020',
           'Bethel Census Area, AK': '050',
@@ -3448,7 +3448,7 @@ FIPS_COUNTIES = {
           'Wrangell-Petersburg Census Area, AK': '280',
           'Yakutat Borough, AK': '282',
           'Yukon-Koyukuk Census Area, AK': '290'},
-  '04': { 'Apache County, AZ': '001',
+  '04':  {'Apache County, AZ': '001',
           'Cochise County, AZ': '003',
           'Coconino County, AZ': '005',
           'Gila County, AZ': '007',
@@ -3463,7 +3463,7 @@ FIPS_COUNTIES = {
           'Santa Cruz County, AZ': '023',
           'Yavapai County, AZ': '025',
           'Yuma County, AZ': '027'},
-  '05': { 'Arkansas County, AR': '001',
+  '05':  {'Arkansas County, AR': '001',
           'Ashley County, AR': '003',
           'Baxter County, AR': '005',
           'Benton County, AR': '007',
@@ -3538,7 +3538,7 @@ FIPS_COUNTIES = {
           'White County, AR': '145',
           'Woodruff County, AR': '147',
           'Yell County, AR': '149'},
-  '06': { 'Alameda County, CA': '001',
+  '06':  {'Alameda County, CA': '001',
           'Alpine County, CA': '003',
           'Amador County, CA': '005',
           'Butte County, CA': '007',
@@ -3596,7 +3596,7 @@ FIPS_COUNTIES = {
           'Ventura County, CA': '111',
           'Yolo County, CA': '113',
           'Yuba County, CA': '115'},
-  '08': { 'Adams County, CO': '001',
+  '08':  {'Adams County, CO': '001',
           'Alamosa County, CO': '003',
           'Arapahoe County, CO': '005',
           'Archuleta County, CO': '007',
@@ -3660,7 +3660,7 @@ FIPS_COUNTIES = {
           'Washington County, CO': '121',
           'Weld County, CO': '123',
           'Yuma County, CO': '125'},
-  '09': { 'Fairfield County, CT': '001',
+  '09':  {'Fairfield County, CT': '001',
           'Hartford County, CT': '003',
           'Litchfield County, CT': '005',
           'Middlesex County, CT': '007',
@@ -3668,11 +3668,11 @@ FIPS_COUNTIES = {
           'New London County, CT': '011',
           'Tolland County, CT': '013',
           'Windham County, CT': '015'},
-  '10': { 'Kent County, DE': '001',
+  '10':  {'Kent County, DE': '001',
           'New Castle County, DE': '003',
           'Sussex County, DE': '005'},
-  '11': { 'District of Columbia': '001'},
-  '12': { 'Alachua County, FL': '001',
+  '11':  {'District of Columbia': '001'},
+  '12':  {'Alachua County, FL': '001',
           'Baker County, FL': '003',
           'Bay County, FL': '005',
           'Bradford County, FL': '007',
@@ -3739,7 +3739,7 @@ FIPS_COUNTIES = {
           'Wakulla County, FL': '129',
           'Walton County, FL': '131',
           'Washington County, FL': '133'},
-  '13': { 'Appling County, GA': '001',
+  '13':  {'Appling County, GA': '001',
           'Atkinson County, GA': '003',
           'Bacon County, GA': '005',
           'Baker County, GA': '007',
@@ -3898,11 +3898,11 @@ FIPS_COUNTIES = {
           'Wilkes County, GA': '317',
           'Wilkinson County, GA': '319',
           'Worth County, GA': '321'},
-  '15': { 'Hawaii County, HI': '001',
+  '15':  {'Hawaii County, HI': '001',
           'Honolulu County/city, HI': '003',
           'Kauai County, HI': '007',
           'Maui County, HI': '009'},
-  '16': { 'Ada County, ID': '001',
+  '16':  {'Ada County, ID': '001',
           'Adams County, ID': '003',
           'Bannock County, ID': '005',
           'Bear Lake County, ID': '007',
@@ -3946,7 +3946,7 @@ FIPS_COUNTIES = {
           'Twin Falls County, ID': '083',
           'Valley County, ID': '085',
           'Washington County, ID': '087'},
-  '17': { 'Adams County, IL': '001',
+  '17':  {'Adams County, IL': '001',
           'Alexander County, IL': '003',
           'Bond County, IL': '005',
           'Boone County, IL': '007',
@@ -4048,7 +4048,7 @@ FIPS_COUNTIES = {
           'Williamson County, IL': '199',
           'Winnebago County, IL': '201',
           'Woodford County, IL': '203'},
-  '18': { 'Adams County, IN': '001',
+  '18':  {'Adams County, IN': '001',
           'Allen County, IN': '003',
           'Bartholomew County, IN': '005',
           'Benton County, IN': '007',
@@ -4140,7 +4140,7 @@ FIPS_COUNTIES = {
           'Wells County, IN': '179',
           'White County, IN': '181',
           'Whitley County, IN': '183'},
-  '19': { 'Adair County, IA': '001',
+  '19':  {'Adair County, IA': '001',
           'Adams County, IA': '003',
           'Allamakee County, IA': '005',
           'Appanoose County, IA': '007',
@@ -4239,7 +4239,7 @@ FIPS_COUNTIES = {
           'Woodbury County, IA': '193',
           'Worth County, IA': '195',
           'Wright County, IA': '197'},
-  '20': { 'Allen County, KS': '001',
+  '20':  {'Allen County, KS': '001',
           'Anderson County, KS': '003',
           'Atchison County, KS': '005',
           'Barber County, KS': '007',
@@ -4344,7 +4344,7 @@ FIPS_COUNTIES = {
           'Wilson County, KS': '205',
           'Woodson County, KS': '207',
           'Wyandotte County, KS': '209'},
-  '21': { 'Adair County, KY': '001',
+  '21':  {'Adair County, KY': '001',
           'Allen County, KY': '003',
           'Anderson County, KY': '005',
           'Ballard County, KY': '007',
@@ -4464,7 +4464,7 @@ FIPS_COUNTIES = {
           'Whitley County, KY': '235',
           'Wolfe County, KY': '237',
           'Woodford County, KY': '239'},
-  '22': { 'Acadia Parish, LA': '001',
+  '22':  {'Acadia Parish, LA': '001',
           'Allen Parish, LA': '003',
           'Ascension Parish, LA': '005',
           'Assumption Parish, LA': '007',
@@ -4528,7 +4528,7 @@ FIPS_COUNTIES = {
           'West Carroll Parish, LA': '123',
           'West Feliciana Parish, LA': '125',
           'Winn Parish, LA': '127'},
-  '23': { 'Androscoggin County, ME': '001',
+  '23':  {'Androscoggin County, ME': '001',
           'Aroostook County, ME': '003',
           'Cumberland County, ME': '005',
           'Franklin County, ME': '007',
@@ -4544,7 +4544,7 @@ FIPS_COUNTIES = {
           'Waldo County, ME': '027',
           'Washington County, ME': '029',
           'York County, ME': '031'},
-  '24': { 'Allegany County, MD': '001',
+  '24':  {'Allegany County, MD': '001',
           'Anne Arundel County, MD': '003',
           'Baltimore County, MD': '005',
           'Baltimore city, MD': '510',
@@ -4568,7 +4568,7 @@ FIPS_COUNTIES = {
           'Washington County, MD': '043',
           'Wicomico County, MD': '045',
           'Worcester County, MD': '047'},
-  '25': { 'Barnstable County, MA': '001',
+  '25':  {'Barnstable County, MA': '001',
           'Berkshire County, MA': '003',
           'Bristol County, MA': '005',
           'Dukes County, MA': '007',
@@ -4582,7 +4582,7 @@ FIPS_COUNTIES = {
           'Plymouth County, MA': '023',
           'Suffolk County, MA': '025',
           'Worcester County, MA': '027'},
-  '26': { 'Alcona County, MI': '001',
+  '26':  {'Alcona County, MI': '001',
           'Alger County, MI': '003',
           'Allegan County, MI': '005',
           'Alpena County, MI': '007',
@@ -4665,7 +4665,7 @@ FIPS_COUNTIES = {
           'Washtenaw County, MI': '161',
           'Wayne County, MI': '163',
           'Wexford County, MI': '165'},
-  '27': { 'Aitkin County, MN': '001',
+  '27':  {'Aitkin County, MN': '001',
           'Anoka County, MN': '003',
           'Becker County, MN': '005',
           'Beltrami County, MN': '007',
@@ -4752,7 +4752,7 @@ FIPS_COUNTIES = {
           'Winona County, MN': '169',
           'Wright County, MN': '171',
           'Yellow Medicine County, MN': '173'},
-  '28': { 'Adams County, MS': '001',
+  '28':  {'Adams County, MS': '001',
           'Alcorn County, MS': '003',
           'Amite County, MS': '005',
           'Attala County, MS': '007',
@@ -4834,7 +4834,7 @@ FIPS_COUNTIES = {
           'Winston County, MS': '159',
           'Yalobusha County, MS': '161',
           'Yazoo County, MS': '163'},
-  '29': { 'Adair County, MO': '001',
+  '29':  {'Adair County, MO': '001',
           'Andrew County, MO': '003',
           'Atchison County, MO': '005',
           'Audrain County, MO': '007',
@@ -4949,7 +4949,7 @@ FIPS_COUNTIES = {
           'Webster County, MO': '225',
           'Worth County, MO': '227',
           'Wright County, MO': '229'},
-  '30': { 'Beaverhead County, MT': '001',
+  '30':  {'Beaverhead County, MT': '001',
           'Big Horn County, MT': '003',
           'Blaine County, MT': '005',
           'Broadwater County, MT': '007',
@@ -5005,7 +5005,7 @@ FIPS_COUNTIES = {
           'Wheatland County, MT': '107',
           'Wibaux County, MT': '109',
           'Yellowstone County, MT': '111'},
-  '31': { 'Adams County, NE': '001',
+  '31':  {'Adams County, NE': '001',
           'Antelope County, NE': '003',
           'Arthur County, NE': '005',
           'Banner County, NE': '007',
@@ -5098,7 +5098,7 @@ FIPS_COUNTIES = {
           'Webster County, NE': '181',
           'Wheeler County, NE': '183',
           'York County, NE': '185'},
-  '32': { 'Carson City, NV': '510',
+  '32':  {'Carson City, NV': '510',
           'Churchill County, NV': '001',
           'Clark County, NV': '003',
           'Douglas County, NV': '005',
@@ -5115,7 +5115,7 @@ FIPS_COUNTIES = {
           'Storey County, NV': '029',
           'Washoe County, NV': '031',
           'White Pine County, NV': '033'},
-  '33': { 'Belknap County, NH': '001',
+  '33':  {'Belknap County, NH': '001',
           'Carroll County, NH': '003',
           'Cheshire County, NH': '005',
           'Coos County, NH': '007',
@@ -5125,7 +5125,7 @@ FIPS_COUNTIES = {
           'Rockingham County, NH': '015',
           'Strafford County, NH': '017',
           'Sullivan County, NH': '019'},
-  '34': { 'Atlantic County, NJ': '001',
+  '34':  {'Atlantic County, NJ': '001',
           'Bergen County, NJ': '003',
           'Burlington County, NJ': '005',
           'Camden County, NJ': '007',
@@ -5146,7 +5146,7 @@ FIPS_COUNTIES = {
           'Sussex County, NJ': '037',
           'Union County, NJ': '039',
           'Warren County, NJ': '041'},
-  '35': { 'Bernalillo County, NM': '001',
+  '35':  {'Bernalillo County, NM': '001',
           'Catron County, NM': '003',
           'Chaves County, NM': '005',
           'Cibola County, NM': '006',
@@ -5179,7 +5179,7 @@ FIPS_COUNTIES = {
           'Torrance County, NM': '057',
           'Union County, NM': '059',
           'Valencia County, NM': '061'},
-  '36': { 'Albany County, NY': '001',
+  '36':  {'Albany County, NY': '001',
           'Allegany County, NY': '003',
           'Bronx County, NY': '005',
           'Broome County, NY': '007',
@@ -5241,7 +5241,7 @@ FIPS_COUNTIES = {
           'Westchester County, NY': '119',
           'Wyoming County, NY': '121',
           'Yates County, NY': '123'},
-  '37': { 'Alamance County, NC': '001',
+  '37':  {'Alamance County, NC': '001',
           'Alexander County, NC': '003',
           'Alleghany County, NC': '005',
           'Anson County, NC': '007',
@@ -5341,7 +5341,7 @@ FIPS_COUNTIES = {
           'Wilson County, NC': '195',
           'Yadkin County, NC': '197',
           'Yancey County, NC': '199'},
-  '38': { 'Adams County, ND': '001',
+  '38':  {'Adams County, ND': '001',
           'Barnes County, ND': '003',
           'Benson County, ND': '005',
           'Billings County, ND': '007',
@@ -5394,7 +5394,7 @@ FIPS_COUNTIES = {
           'Ward County, ND': '101',
           'Wells County, ND': '103',
           'Williams County, ND': '105'},
-  '39': { 'Adams County, OH': '001',
+  '39':  {'Adams County, OH': '001',
           'Allen County, OH': '003',
           'Ashland County, OH': '005',
           'Ashtabula County, OH': '007',
@@ -5482,7 +5482,7 @@ FIPS_COUNTIES = {
           'Williams County, OH': '171',
           'Wood County, OH': '173',
           'Wyandot County, OH': '175'},
-  '40': { 'Adair County, OK': '001',
+  '40':  {'Adair County, OK': '001',
           'Alfalfa County, OK': '003',
           'Atoka County, OK': '005',
           'Beaver County, OK': '007',
@@ -5559,7 +5559,7 @@ FIPS_COUNTIES = {
           'Washita County, OK': '149',
           'Woods County, OK': '151',
           'Woodward County, OK': '153'},
-  '41': { 'Baker County, OR': '001',
+  '41':  {'Baker County, OR': '001',
           'Benton County, OR': '003',
           'Clackamas County, OR': '005',
           'Clatsop County, OR': '007',
@@ -5595,7 +5595,7 @@ FIPS_COUNTIES = {
           'Washington County, OR': '067',
           'Wheeler County, OR': '069',
           'Yamhill County, OR': '071'},
-  '42': { 'Adams County, PA': '001',
+  '42':  {'Adams County, PA': '001',
           'Allegheny County, PA': '003',
           'Armstrong County, PA': '005',
           'Beaver County, PA': '007',
@@ -5662,12 +5662,12 @@ FIPS_COUNTIES = {
           'Westmoreland County, PA': '129',
           'Wyoming County, PA': '131',
           'York County, PA': '133'},
-  '44': { 'Bristol County, RI': '001',
+  '44':  {'Bristol County, RI': '001',
           'Kent County, RI': '003',
           'Newport County, RI': '005',
           'Providence County, RI': '007',
           'Washington County, RI': '009'},
-  '45': { 'Abbeville County, SC': '001',
+  '45':  {'Abbeville County, SC': '001',
           'Aiken County, SC': '003',
           'Allendale County, SC': '005',
           'Anderson County, SC': '007',
@@ -5713,7 +5713,7 @@ FIPS_COUNTIES = {
           'Union County, SC': '087',
           'Williamsburg County, SC': '089',
           'York County, SC': '091'},
-  '46': { 'Aurora County, SD': '003',
+  '46':  {'Aurora County, SD': '003',
           'Beadle County, SD': '005',
           'Bennett County, SD': '007',
           'Bon Homme County, SD': '009',
@@ -5779,7 +5779,7 @@ FIPS_COUNTIES = {
           'Walworth County, SD': '129',
           'Yankton County, SD': '135',
           'Ziebach County, SD': '137'},
-  '47': { 'Anderson County, TN': '001',
+  '47':  {'Anderson County, TN': '001',
           'Bedford County, TN': '003',
           'Benton County, TN': '005',
           'Bledsoe County, TN': '007',
@@ -5874,7 +5874,7 @@ FIPS_COUNTIES = {
           'White County, TN': '185',
           'Williamson County, TN': '187',
           'Wilson County, TN': '189'},
-  '48': { 'Anderson County, TX': '001',
+  '48':  {'Anderson County, TX': '001',
           'Andrews County, TX': '003',
           'Angelina County, TX': '005',
           'Aransas County, TX': '007',
@@ -6128,7 +6128,7 @@ FIPS_COUNTIES = {
           'Young County, TX': '503',
           'Zapata County, TX': '505',
           'Zavala County, TX': '507'},
-  '49': { 'Beaver County, UT': '001',
+  '49':  {'Beaver County, UT': '001',
           'Box Elder County, UT': '003',
           'Cache County, UT': '005',
           'Carbon County, UT': '007',
@@ -6157,7 +6157,7 @@ FIPS_COUNTIES = {
           'Washington County, UT': '053',
           'Wayne County, UT': '055',
           'Weber County, UT': '057'},
-  '50': { 'Addison County, VT': '001',
+  '50':  {'Addison County, VT': '001',
           'Bennington County, VT': '003',
           'Caledonia County, VT': '005',
           'Chittenden County, VT': '007',
@@ -6171,7 +6171,7 @@ FIPS_COUNTIES = {
           'Washington County, VT': '023',
           'Windham County, VT': '025',
           'Windsor County, VT': '027'},
-  '51': { 'Accomack County, VA': '001',
+  '51':  {'Accomack County, VA': '001',
           'Albemarle County, VA': '003',
           'Alexandria city, VA': '510',
           'Alleghany County, VA': '005',
@@ -6305,7 +6305,7 @@ FIPS_COUNTIES = {
           'Wise County, VA': '195',
           'Wythe County, VA': '197',
           'York County, VA': '199'},
-  '53': { 'Adams County, WA': '001',
+  '53':  {'Adams County, WA': '001',
           'Asotin County, WA': '003',
           'Benton County, WA': '005',
           'Chelan County, WA': '007',
@@ -6344,7 +6344,7 @@ FIPS_COUNTIES = {
           'Whatcom County, WA': '073',
           'Whitman County, WA': '075',
           'Yakima County, WA': '077'},
-  '54': { 'Barbour County, WV': '001',
+  '54':  {'Barbour County, WV': '001',
           'Berkeley County, WV': '003',
           'Boone County, WV': '005',
           'Braxton County, WV': '007',
@@ -6399,7 +6399,7 @@ FIPS_COUNTIES = {
           'Wirt County, WV': '105',
           'Wood County, WV': '107',
           'Wyoming County, WV': '109'},
-  '55': { 'Adams County, WI': '001',
+  '55':  {'Adams County, WI': '001',
           'Ashland County, WI': '003',
           'Barron County, WI': '005',
           'Bayfield County, WI': '007',
@@ -6471,7 +6471,7 @@ FIPS_COUNTIES = {
           'Waushara County, WI': '137',
           'Winnebago County, WI': '139',
           'Wood County, WI': '141'},
-  '56': { 'Albany County, WY': '001',
+  '56':  {'Albany County, WY': '001',
           'Big Horn County, WY': '003',
           'Campbell County, WY': '005',
           'Carbon County, WY': '007',
@@ -6494,7 +6494,7 @@ FIPS_COUNTIES = {
           'Uinta County, WY': '041',
           'Washakie County, WY': '043',
           'Weston County, WY': '045'},
-  '72': { 'Adjuntas Municipio, PR': '001',
+  '72':  {'Adjuntas Municipio, PR': '001',
           'Aguada Municipio, PR': '003',
           'Aguadilla Municipio, PR': '005',
           'Aguas Buenas Municipio, PR': '007',
@@ -6572,19 +6572,19 @@ FIPS_COUNTIES = {
           'Villalba Municipio, PR': '149',
           'Yabucoa Municipio, PR': '151',
           'Yauco Municipio, PR': '153'},
-  "CA01": { '--All--': '%', },
-  "CA02": { '--All--': '%', },
-  "CA03": { '--All--': '%', },
-  "CA04": { '--All--': '%', },
-  "CA05": { '--All--': '%', },
-  "CA13": { '--All--': '%', },
-  "CA07": { '--All--': '%', },
-  "CA14": { '--All--': '%', },
-  "CA08": { '--All--': '%', },
-  "CA09": { '--All--': '%', },
-  "CA10": { '--All--': '%', },
-  "CA11": { '--All--': '%', },
-  "CA12": { '--All--': '%', },
+  "CA01": {'--All--': '%', },
+  "CA02": {'--All--': '%', },
+  "CA03": {'--All--': '%', },
+  "CA04": {'--All--': '%', },
+  "CA05": {'--All--': '%', },
+  "CA13": {'--All--': '%', },
+  "CA07": {'--All--': '%', },
+  "CA14": {'--All--': '%', },
+  "CA08": {'--All--': '%', },
+  "CA09": {'--All--': '%', },
+  "CA10": {'--All--': '%', },
+  "CA11": {'--All--': '%', },
+  "CA12": {'--All--': '%', },
 }
 
 
@@ -6592,15 +6592,14 @@ if __name__ == "__main__":
     from sys import argv
     from pprint import PrettyPrinter
     pp = PrettyPrinter(indent=2)
-    
+
     import csv
-    fipsreader = csv.reader(open(argv[1],'rb'), delimiter=',', quotechar='"')
+    fipsreader = csv.reader(open(argv[1], 'rb'), delimiter=',', quotechar='"')
     for row in fipsreader:
         try:
             FIPS_COUNTIES[int(row[1])][row[3]] = row[2]
         except KeyError:
             FIPS_COUNTIES[int(row[1])] = {'--All--': '%'}
             FIPS_COUNTIES[int(row[1])][row[3]] = row[2]
-    
+
     pp.pprint(FIPS_COUNTIES)
-    
\ No newline at end of file
diff --git a/tools/cpep8.blacklist b/tools/cpep8.blacklist
index 54f568f..2824a96 100644
--- a/tools/cpep8.blacklist
+++ b/tools/cpep8.blacklist
@@ -70,6 +70,5 @@
 ./chirp/wouxun.py
 ./chirp/wouxun_common.py
 ./chirp/yaesu_clone.py
-./chirpui/fips.py
 ./tools/bitdiff.py
 ./tools/img2thd72.py




More information about the chirp_devel mailing list