It is now pretty much PEP8 happy
[gonvert] / src / gonvert_glade.py
index 3a9d2ec..5c4edc8 100755 (executable)
@@ -41,39 +41,39 @@ def edit_shortlist(a):
                print "0"
 
 
-def app_size_changed(a,b):
+def app_size_changed(a, b):
        ''"get current size of window as it changes.''"
-       evil_globals.window_size=mainWindow.get_size()
+       evil_globals.window_size = mainWindow.get_size()
 
 
 def clear_selections(a):
        selectionsDatPath = "/".join((constants._data_path_, "selections.dat"))
        os.remove(selectionsDatPath)
-       evil_globals.selected_units={}
+       evil_globals.selected_units = {}
 
 
 def exitprogram(a):
        """
-       This routine saves the selections to a file, and 
-        should therefore only be called when exiting the program.
-       
-        Update selections dictionary which consists of the following keys:
-        'evil_globals.selected_category': full name of selected category
-        'evil_globals.selected_units': evil_globals.selected_units dictionary which contains:
-                               [categoryname: #1 displayed unit, #2 displayed unit]
+       This routine saves the selections to a file, and
+       should therefore only be called when exiting the program.
+
+       Update selections dictionary which consists of the following keys:
+       'evil_globals.selected_category': full name of selected category
+       'evil_globals.selected_units': evil_globals.selected_units dictionary which contains:
+       [categoryname: #1 displayed unit, #2 displayed unit]
        """
        #Determine the contents of the selected category row
-       selected,iter= categoryView.get_selection().get_selected()
-       evil_globals.selected_category = categoryModel.get_value(iter,0)
+       selected, iter = categoryView.get_selection().get_selected()
+       evil_globals.selected_category = categoryModel.get_value(iter, 0)
 
-       selections = {'evil_globals.selected_category':evil_globals.selected_category, 'evil_globals.selected_units':evil_globals.selected_units}
+       selections = {'evil_globals.selected_category': evil_globals.selected_category, 'evil_globals.selected_units': evil_globals.selected_units}
        selectionsDatPath = "/".join((constants._data_path_, "selections.dat"))
-       pickle.dump(selections, open(selectionsDatPath,'w'))
+       pickle.dump(selections, open(selectionsDatPath, 'w'))
 
        #Get last size of app and save it
-       window_settings = {'size':evil_globals.window_size}
+       window_settings = {'size': evil_globals.window_size}
        windowDatPath = "/".join((constants._data_path_, "window.dat"))
-       pickle.dump(window_settings, open(windowDatPath,'w'))
+       pickle.dump(window_settings, open(windowDatPath, 'w'))
 
        gtk.mainquit
        sys.exit()
@@ -81,16 +81,16 @@ def exitprogram(a):
 
 def findEntry_changed(a):
        #Clear out find results since the user wants to look for something new
-       evil_globals.find_result=[] #empty find result list
-       evil_globals.find_count=0 #default to find result number zero
+       evil_globals.find_result = [] #empty find result list
+       evil_globals.find_count = 0 #default to find result number zero
        findLabel.set_text('') #clear result
 
 
-def find_key_press(a,b):
+def find_key_press(a, b):
        #Check if the key pressed was an ASCII key
        if len(b.string)>0:
                #Check if the key pressed was the 'Enter' key
-               if ord(b.string[0])==13:
+               if ord(b.string[0]) == 13:
                        #Execute the find units function
                        find_units(1)
 
@@ -114,60 +114,60 @@ def find_units(a):
        #check if 'new find' or 'last find' or 'next-find'
 
        #new-find = run the find algorithm which also selects the first found unit
-       #         = evil_globals.find_count=0 and evil_globals.find_result=[]
+       #         = evil_globals.find_count = 0 and evil_globals.find_result = []
 
        #last-find = restart from top again
-       #          = evil_globals.find_count=len(evil_globals.find_result)
+       #          = evil_globals.find_count = len(evil_globals.find_result)
 
        #next-find = continue to next found location
-       #           = evil_globals.find_count=0 and len(evil_globals.find_result)>0
+       #           = evil_globals.find_count = 0 and len(evil_globals.find_result)>0
 
        #check for new-find
-       if len(evil_globals.find_result)==0:
+       if len(evil_globals.find_result) == 0:
                find_string = string.lower(string.strip(findEntry.get_text()))
                #Make sure that a valid find string has been requested
                if len(find_string)>0:
                        categories = unit_data.list_dic.keys()
                        categories.sort()
-                       found_a_unit=0 #reset the 'found-a-unit' flag
-                       cat_no=0
+                       found_a_unit = 0 #reset the 'found-a-unit' flag
+                       cat_no = 0
                        for category in categories:
-                               units=unit_data.list_dic[category].keys()
+                               units = unit_data.list_dic[category].keys()
                                units.sort()
                                del units[0] # do not display .base_unit description key
-                               unit_no=0
+                               unit_no = 0
                                for unit in units:
-                                       if string.find(string.lower(unit), find_string)>=0:
-                                               found_a_unit=1 #indicate that a unit was found
-                                               #print "'",find_string,"'"," found at category=", category," unit =",unit
-                                               evil_globals.find_result.append((category,unit,cat_no,unit_no))
-                                       unit_no=unit_no+1
-                               cat_no=cat_no+1
-
-                       if found_a_unit==1:
+                                       if string.find(string.lower(unit), find_string) >= 0:
+                                               found_a_unit = 1 #indicate that a unit was found
+                                               #print "'", find_string, "'", " found at category = ", category, " unit = ", unit
+                                               evil_globals.find_result.append((category, unit, cat_no, unit_no))
+                                       unit_no = unit_no+1
+                               cat_no = cat_no+1
+
+                       if found_a_unit == 1:
                                #select the first found unit
-                               evil_globals.find_count=0
+                               evil_globals.find_count = 0
                                #check if next find is in a new category (prevent category changes when unnecessary
-                               if evil_globals.selected_category!=evil_globals.find_result[evil_globals.find_count][0]:
-                                       categoryView.set_cursor(evil_globals.find_result[0][2],categoryColumn,False)
-                                       unitsView.set_cursor(evil_globals.find_result[0][3],unitNameColumn,True)
+                               if evil_globals.selected_category != evil_globals.find_result[evil_globals.find_count][0]:
+                                       categoryView.set_cursor(evil_globals.find_result[0][2], categoryColumn, False)
+                                       unitsView.set_cursor(evil_globals.find_result[0][3], unitNameColumn, True)
                                        if len(evil_globals.find_result)>1:
                                                findLabel.set_text(('Press Find for next unit. '+ str(len(evil_globals.find_result))+' result(s).'))
                                        else:
                                                findLabel.set_text('Text not found') #Display error
        else: #must be next-find or last-find
                #check for last-find
-               if evil_globals.find_count==len(evil_globals.find_result)-1:
+               if evil_globals.find_count == len(evil_globals.find_result)-1:
                        #select first result
-                       evil_globals.find_count=0
-                       categoryView.set_cursor(evil_globals.find_result[evil_globals.find_count][2],categoryColumn,False)
-                       unitsView.set_cursor(evil_globals.find_result[evil_globals.find_count][3],unitNameColumn,True)
+                       evil_globals.find_count = 0
+                       categoryView.set_cursor(evil_globals.find_result[evil_globals.find_count][2], categoryColumn, False)
+                       unitsView.set_cursor(evil_globals.find_result[evil_globals.find_count][3], unitNameColumn, True)
                else: #must be next-find
-                       evil_globals.find_count=evil_globals.find_count+1
+                       evil_globals.find_count = evil_globals.find_count+1
                        #check if next find is in a new category (prevent category changes when unnecessary
-                       if evil_globals.selected_category!=evil_globals.find_result[evil_globals.find_count][0]:
-                               categoryView.set_cursor(evil_globals.find_result[evil_globals.find_count][2],categoryColumn,False)
-                       unitsView.set_cursor(evil_globals.find_result[evil_globals.find_count][3],unitNameColumn,True)
+                       if evil_globals.selected_category != evil_globals.find_result[evil_globals.find_count][0]:
+                               categoryView.set_cursor(evil_globals.find_result[evil_globals.find_count][2], categoryColumn, False)
+                       unitsView.set_cursor(evil_globals.find_result[evil_globals.find_count][3], unitNameColumn, True)
 
 
 def click_unit_column(col):
@@ -181,19 +181,19 @@ def click_unit_column(col):
 
        #Determine which column requires sorting
        if col is unitNameColumn:
-               selectedUnitColumn=0
+               selectedUnitColumn = 0
                unitNameColumn.set_sort_indicator(True)
                unitValueColumn.set_sort_indicator(False)
                unitSymbolColumn.set_sort_indicator(False)
                unitNameColumn.set_sort_order(not evil_globals.unit_sort_direction)
        elif col is unitValueColumn:
-               selectedUnitColumn=1
+               selectedUnitColumn = 1
                unitNameColumn.set_sort_indicator(False)
                unitValueColumn.set_sort_indicator(True)
                unitSymbolColumn.set_sort_indicator(False)
                unitValueColumn.set_sort_order(not evil_globals.value_sort_direction)
        elif col is unitSymbolColumn:
-               selectedUnitColumn=2
+               selectedUnitColumn = 2
                unitNameColumn.set_sort_indicator(False)
                unitValueColumn.set_sort_indicator(False)
                unitSymbolColumn.set_sort_indicator(True)
@@ -205,89 +205,89 @@ def click_unit_column(col):
        sorted_list = []
 
        #point to the first row
-       iter=unitModel.get_iter_first()
-       row=0
+       iter = unitModel.get_iter_first()
+       row = 0
 
-       while (iter):
+       while iter:
                #grab all text from columns for sorting
 
                #get the text from each column
-               unit_text = unitModel.get_value(iter,0)
-               units_text = unitModel.get_value(iter,2)
+               unit_text = unitModel.get_value(iter, 0)
+               units_text = unitModel.get_value(iter, 2)
 
                #do not bother sorting if the value column is empty
-               if unitModel.get_value(iter,1)=='' and selectedUnitColumn==1:
+               if unitModel.get_value(iter, 1) == '' and selectedUnitColumn == 1:
                        return
 
                #special sorting exceptions for ascii values (instead of float values)
                if evil_globals.selected_category == "Computer Numbers":
-                       value_text = unitModel.get_value(iter,1)
+                       value_text = unitModel.get_value(iter, 1)
                else:
-                       if unitModel.get_value(iter,1)==None or unit_model.get_value(iter,1)=='':
+                       if unitModel.get_value(iter, 1) == None or unit_model.get_value(iter, 1) == '':
                                value_text = ''
                        else:
-                               value_text = float(unitModel.get_value(iter,1))
+                               value_text = float(unitModel.get_value(iter, 1))
 
-               if selectedUnitColumn==0:
-                       sorted_list.append((unit_text,value_text,units_text))
-               elif selectedUnitColumn==1:
-                       sorted_list.append((value_text,unit_text,units_text))
+               if selectedUnitColumn == 0:
+                       sorted_list.append((unit_text, value_text, units_text))
+               elif selectedUnitColumn == 1:
+                       sorted_list.append((value_text, unit_text, units_text))
                else:
-                       sorted_list.append((units_text,value_text,unit_text))
+                       sorted_list.append((units_text, value_text, unit_text))
 
                #point to the next row in the unitModel
-               iter=unitModel.iter_next(iter)
-               row=row+1
+               iter = unitModel.iter_next(iter)
+               row = row+1
 
        #check if no calculations have been made yet (don't bother sorting)
-       if row==0:
+       if row == 0:
                return
        else:
-               if selectedUnitColumn==0:
+               if selectedUnitColumn == 0:
                        if not evil_globals.unit_sort_direction:
-                               sorted_list.sort(lambda (x,xx,xxx), (y,yy,yyy): cmp(string.lower(x),string.lower(y)))
-                               evil_globals.unit_sort_direction=True
+                               sorted_list.sort(lambda (x, xx, xxx), (y, yy, yyy): cmp(string.lower(x), string.lower(y)))
+                               evil_globals.unit_sort_direction = True
                        else:
-                               sorted_list.sort(lambda (x,xx,xxx), (y,yy,yyy): cmp(string.lower(y),string.lower(x)))
-                               evil_globals.unit_sort_direction=False
-               elif selectedUnitColumn==1:
+                               sorted_list.sort(lambda (x, xx, xxx), (y, yy, yyy): cmp(string.lower(y), string.lower(x)))
+                               evil_globals.unit_sort_direction = False
+               elif selectedUnitColumn == 1:
                        sorted_list.sort()
                        if not evil_globals.value_sort_direction:
-                               evil_globals.value_sort_direction=True
+                               evil_globals.value_sort_direction = True
                        else:
                                sorted_list.reverse()
-                               evil_globals.value_sort_direction=False
+                               evil_globals.value_sort_direction = False
                else:
                        if not evil_globals.units_sort_direction:
-                               sorted_list.sort(lambda (x,xx,xxx), (y,yy,yyy): cmp(string.lower(x),string.lower(y)))
-                               evil_globals.units_sort_direction=True
+                               sorted_list.sort(lambda (x, xx, xxx), (y, yy, yyy): cmp(string.lower(x), string.lower(y)))
+                               evil_globals.units_sort_direction = True
                        else:
-                               sorted_list.sort(lambda (x,xx,xxx), (y,yy,yyy): cmp(string.lower(y),string.lower(x)))
-                               evil_globals.units_sort_direction=False
+                               sorted_list.sort(lambda (x, xx, xxx), (y, yy, yyy): cmp(string.lower(y), string.lower(x)))
+                               evil_globals.units_sort_direction = False
 
                #Clear out the previous list of units
-               unitModel = gtk.ListStore(gobject.TYPE_STRING,gobject.TYPE_STRING,gobject.TYPE_STRING)
+               unitModel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
                unitsView.set_model(unitModel)
 
                #colourize each row differently for easier reading
-               unitsView.set_property( 'rules_hint',1)
+               unitsView.set_property('rules_hint', 1)
 
                #Clear out the description
                text_model = gtk.TextBuffer(None)
                unitDescription.set_buffer(text_model)
 
-               if selectedUnitColumn==0:
-                       for unit,value,units in sorted_list:
+               if selectedUnitColumn == 0:
+                       for unit, value, units in sorted_list:
                                iter = unitModel.append()
-                               unitModel.set(iter,0,unit,1,str(value),2,units)
-               elif selectedUnitColumn==1:
-                       for value,unit,units in sorted_list:
+                               unitModel.set(iter, 0, unit, 1, str(value), 2, units)
+               elif selectedUnitColumn == 1:
+                       for value, unit, units in sorted_list:
                                iter = unitModel.append()
-                               unitModel.set(iter,0,unit,1,str(value),2,units)
+                               unitModel.set(iter, 0, unit, 1, str(value), 2, units)
                else:
-                       for units,value,unit in sorted_list:
+                       for units, value, unit in sorted_list:
                                iter = unitModel.append()
-                               unitModel.set(iter,0,unit,1,str(value),2,units)
+                               unitModel.set(iter, 0, unit, 1, str(value), 2, units)
        return
 
 
@@ -296,20 +296,20 @@ def click_category(row):
        global unit_dic, list_dic
 
        #Clear out the previous list of units
-       unitModel = gtk.ListStore(gobject.TYPE_STRING,gobject.TYPE_STRING,gobject.TYPE_STRING)
+       unitModel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
        unitsView.set_model(unitModel)
 
        #Colourize each row alternately for easier reading
-       unitsView.set_property( 'rules_hint',1)
+       unitsView.set_property('rules_hint', 1)
 
        #Clear out the description
        text_model = gtk.TextBuffer(None)
        unitDescription.set_buffer(text_model)
 
        #Determine the contents of the selected category row
-       selected,iter= row.get_selection().get_selected()
+       selected, iter = row.get_selection().get_selected()
 
-       evil_globals.selected_category = categoryModel.get_value(iter,0)
+       evil_globals.selected_category = categoryModel.get_value(iter, 0)
 
        evil_globals.unit_sort_direction = False
        evil_globals.value_sort_direction = False
@@ -318,7 +318,7 @@ def click_category(row):
        unitValueColumn.set_sort_indicator(False)
        unitSymbolColumn.set_sort_indicator(False)
 
-       unit_dic=unit_data.list_dic[selected.get_value(iter,0)]
+       unit_dic = unit_data.list_dic[selected.get_value(iter, 0)]
        keys = unit_dic.keys()
        keys.sort()
        del keys[0] # do not display .base_unit description key
@@ -326,7 +326,7 @@ def click_category(row):
        #Fill up the units descriptions and clear the value cells
        for key in keys:
                iter = unitModel.append()
-               unitModel.set(iter,0,key,1,'',2,unit_dic[key][1])
+               unitModel.set(iter, 0, key, 1, '', 2, unit_dic[key][1])
 
        unitName.set_text('')
        unitValue.set_text('')
@@ -343,36 +343,36 @@ def restore_units():
 
        # Restore the previous historical settings of previously selected units in this newly selected category
        #Since category has just been clicked, the list will be sorted already.
-       if evil_globals.selected_units.has_key(evil_globals.selected_category):
+       if evil_globals.selected_category in evil_globals.selected_units:
                if evil_globals.selected_units[evil_globals.selected_category][0]:
                        ''"debug ''"
-                       #evil_globals.selected_units[evil_globals.selected_category]=[selected_unit,evil_globals.selected_units[evil_globals.selected_category][0]]
+                       #evil_globals.selected_units[evil_globals.selected_category] = [selected_unit, evil_globals.selected_units[evil_globals.selected_category][0]]
 
-                       units=unit_data.list_dic[evil_globals.selected_category].keys()
+                       units = unit_data.list_dic[evil_globals.selected_category].keys()
                        units.sort()
                        del units[0] # do not display .base_unit description key
 
                        #Restore oldest selection first.
                        if evil_globals.selected_units[evil_globals.selected_category][1]:
-                               unit_no=0
+                               unit_no = 0
                                for unit in units:
-                                       if unit==evil_globals.selected_units[evil_globals.selected_category][1]:
-                                               unitsView.set_cursor(unit_no,unitNameColumn,True)
-                                       unit_no=unit_no+1
+                                       if unit == evil_globals.selected_units[evil_globals.selected_category][1]:
+                                               unitsView.set_cursor(unit_no, unitNameColumn, True)
+                                       unit_no = unit_no+1
 
                        #Restore newest selection second.
-                       unit_no=0
+                       unit_no = 0
                        for unit in units:
-                               if unit==evil_globals.selected_units[evil_globals.selected_category][0]:
-                                       unitsView.set_cursor(unit_no,unitNameColumn,True)
-                               unit_no=unit_no+1
+                               if unit == evil_globals.selected_units[evil_globals.selected_category][0]:
+                                       unitsView.set_cursor(unit_no, unitNameColumn, True)
+                               unit_no = unit_no+1
 
        # select the text so user can start typing right away
        unitValue.grab_focus()
-       unitValue.select_region(0,-1)
+       unitValue.select_region(0, -1)
 
 
-def button_released(row,a):
+def button_released(row, a):
        click_unit(row)
 
 
@@ -380,18 +380,18 @@ def click_unit(row):
        evil_globals.calcsuppress = 1 #suppress calculations
 
        #Determine the contents of the selected row.
-       selected,iter= unitsView.get_selection().get_selected()
+       selected, iter = unitsView.get_selection().get_selected()
 
-       selected_unit=selected.get_value(iter,0)
+       selected_unit = selected.get_value(iter, 0)
 
-       unit_spec=unit_dic[selected_unit]
+       unit_spec = unit_dic[selected_unit]
 
        #Clear out the description
        text_model = gtk.TextBuffer(None)
        unitDescription.set_buffer(text_model)
 
        enditer = text_model.get_end_iter()
-       text_model.insert(enditer,unit_spec[2])
+       text_model.insert(enditer, unit_spec[2])
 
        if unitName.get_text() != selected_unit:
                previousUnitName.set_text(unitName.get_text())
@@ -402,10 +402,10 @@ def click_unit(row):
                        previousUnitSymbol.set_text(unitSymbol.get())
        unitName.set_text(selected_unit)
 
-       unitValue.set_text(selected.get_value(iter,1))
+       unitValue.set_text(selected.get_value(iter, 1))
 
        unitSymbol.set_text(unit_spec[1]) # put units into label text
-       if unitValue.get_text() =='':
+       if unitValue.get_text() == '':
                if evil_globals.selected_category == "Computer Numbers":
                        unitValue.set_text("0")
                else:
@@ -413,15 +413,15 @@ def click_unit(row):
 
        #For historical purposes, record this unit as the most recent one in this category.
        # Also, if a previous unit exists, then shift that previous unit to oldest unit.
-       if evil_globals.selected_units.has_key(evil_globals.selected_category):
+       if evil_globals.selected_category in evil_globals.selected_units:
                if evil_globals.selected_units[evil_globals.selected_category][0]:
-                       evil_globals.selected_units[evil_globals.selected_category]=[selected_unit,evil_globals.selected_units[evil_globals.selected_category][0]]
+                       evil_globals.selected_units[evil_globals.selected_category] = [selected_unit, evil_globals.selected_units[evil_globals.selected_category][0]]
        else:
-               evil_globals.selected_units[evil_globals.selected_category]=[selected_unit,'']
+               evil_globals.selected_units[evil_globals.selected_category] = [selected_unit, '']
 
        # select the text so user can start typing right away
        unitValue.grab_focus()
-       unitValue.select_region(0,-1)
+       unitValue.select_region(0, -1)
 
        evil_globals.calcsuppress = 0 #enable calculations
 
@@ -430,38 +430,38 @@ def write_units(a):
        ''"Write the list of categories and units to stdout for documentation purposes.''"
        messagebox_model = gtk.TextBuffer(None)
        messageboxtext.set_buffer(messagebox_model)
-       messagebox_model.insert_at_cursor(_(u'The units are being written to stdout. You can capture this printout by starting gonvert from the command line as follows:\n$ gonvert > file.txt'),-1)
+       messagebox_model.insert_at_cursor(_(u'The units are being written to stdout. You can capture this printout by starting gonvert from the command line as follows: \n$ gonvert > file.txt'), -1)
        messagebox.show()
        while gtk.events_pending():
-               gtk.mainiteration (False)
-       category_keys=unit_data.list_dic.keys()
+               gtk.mainiteration(False)
+       category_keys = unit_data.list_dic.keys()
        category_keys.sort()
        total_categories = 0
        total_units = 0
        print 'gonvert-%s%s' % (
                constants.__version__,
-               _(u' - Unit Conversion Utility  - Convertible units listing:')
+               _(u' - Unit Conversion Utility  - Convertible units listing: ')
        )
        for category_key in category_keys:
                total_categories = total_categories + 1
-               print category_key,":"
-               unit_dic=unit_data.list_dic[category_key]
+               print category_key, ": "
+               unit_dic = unit_data.list_dic[category_key]
                unit_keys = unit_dic.keys()
                unit_keys.sort()
                del unit_keys[0] # do not display .base_unit description key
                for unit_key in unit_keys:
                        total_units = total_units + 1
-                       print "\t",unit_key
-       print total_categories,' categories'
-       print total_units,' units'
+                       print "\t", unit_key
+       print total_categories, ' categories'
+       print total_units, ' units'
        messagebox_model = gtk.TextBuffer(None)
        messageboxtext.set_buffer(messagebox_model)
-       messagebox_model.insert_at_cursor(_(u'The units list has been written to stdout. You can capture this printout by starting gonvert from the command line as follows:\n$ gonvert > file.txt'),-1)
+       messagebox_model.insert_at_cursor(_(u'The units list has been written to stdout. You can capture this printout by starting gonvert from the command line as follows: \n$ gonvert > file.txt'), -1)
 
 
 class Ccalculate(object):
 
-       def top(self,a):
+       def top(self, a):
                global unitModel
                global testvalue
 
@@ -470,19 +470,19 @@ class Ccalculate(object):
                        return
                # determine if value to be calculated is empty
                if evil_globals.selected_category == "Computer Numbers":
-                       if unitValue.get_text() =='':
+                       if unitValue.get_text() == '':
                                value = '0'
                        else:
-                                value = unitValue.get_text()
+                               value = unitValue.get_text()
                else:
-                       if unitValue.get_text() =='':
+                       if unitValue.get_text() == '':
                                value = 0.0
                        else:
                                value = float(unitValue.get_text())
 
                if unitName.get_text() != '':
-                       func,arg = unit_dic[unitName.get_text()][0] #retrieve the conversion function and value from the selected unit
-                       base = apply(func.to_base,(value,arg,)) #determine the base unit value
+                       func, arg = unit_dic[unitName.get_text()][0] #retrieve the conversion function and value from the selected unit
+                       base = apply(func.to_base, (value, arg, )) #determine the base unit value
 
                        keys = unit_dic.keys()
                        keys.sort()
@@ -490,44 +490,44 @@ class Ccalculate(object):
                        row = 0
 
                        #point to the first row
-                       iter=unitModel.get_iter_first()
+                       iter = unitModel.get_iter_first()
 
-                       while (iter):
+                       while iter:
                                #get the formula from the name at the row
-                               func,arg = unit_dic[unitModel.get_value(iter,0)][0]
+                               func, arg = unit_dic[unitModel.get_value(iter, 0)][0]
 
                                #set the result in the value column
-                               unitModel.set(iter,1,str(apply(func.from_base,(base,arg,))))
+                               unitModel.set(iter, 1, str(apply(func.from_base, (base, arg, ))))
 
                                #point to the next row in the unitModel
-                               iter=unitModel.iter_next(iter)
+                               iter = unitModel.iter_next(iter)
 
                        # if the second row has a unit then update its value
                        if previousUnitName.get_text() != '':
-                               evil_globals.calcsuppress=1
-                               func,arg = unit_dic[previousUnitName.get_text()][0]
-                               previousUnitValue.set_text(str(apply(func.from_base,(base,arg,))))
-                               evil_globals.calcsuppress=0
+                               evil_globals.calcsuppress = 1
+                               func, arg = unit_dic[previousUnitName.get_text()][0]
+                               previousUnitValue.set_text(str(apply(func.from_base, (base, arg, ))))
+                               evil_globals.calcsuppress = 0
 
-       def bottom(self,a):
+       def bottom(self, a):
                if evil_globals.calcsuppress == 1:
                        #evil_globals.calcsuppress = 0
                        return
                # determine if value to be calculated is empty
                if evil_globals.selected_category == "Computer Numbers":
-                       if previousUnitValue.get_text() =='':
+                       if previousUnitValue.get_text() == '':
                                value = '0'
                        else:
                                value = previousUnitValue.get_text()
                else:
-                       if previousUnitValue.get_text() =='':
+                       if previousUnitValue.get_text() == '':
                                value = 0.0
                        else:
                                value = float(previousUnitValue.get_text())
 
                if previousUnitName.get_text() != '':
-                       func,arg = unit_dic[previousUnitName.get_text()][0] #retrieve the conversion function and value from the selected unit
-                       base = apply(func.to_base,(value,arg,)) #determine the base unit value
+                       func, arg = unit_dic[previousUnitName.get_text()][0] #retrieve the conversion function and value from the selected unit
+                       base = apply(func.to_base, (value, arg, )) #determine the base unit value
 
                        keys = unit_dic.keys()
                        keys.sort()
@@ -535,42 +535,26 @@ class Ccalculate(object):
                        row = 0
 
                        #point to the first row
-                       iter=unitModel.get_iter_first()
+                       iter = unitModel.get_iter_first()
 
-                       while (iter):
+                       while iter:
                                #get the formula from the name at the row
-                               func,arg = unit_dic[unitModel.get_value(iter,0)][0]
+                               func, arg = unit_dic[unitModel.get_value(iter, 0)][0]
 
                                #set the result in the value column
-                               unitModel.set(iter,1,str(apply(func.from_base,(base,arg,))))
+                               unitModel.set(iter, 1, str(apply(func.from_base, (base, arg, ))))
 
                                #point to the next row in the unitModel
-                               iter=unitModel.iter_next(iter)
+                               iter = unitModel.iter_next(iter)
 
                        # if the second row has a unit then update its value
                        if unitName.get_text() != '':
-                               evil_globals.calcsuppress=1
-                               func,arg = unit_dic[unitName.get_text()][0]
-                               unitValue.set_text(str(apply(func.from_base,(base,arg,))))
-                               evil_globals.calcsuppress=0
-
-
-# categoryView is categoryView
-# unitConversionLayout
-#      selectedUnitLayouta
-#              unitName
-#              unitValue
-#              unitSymbol
-#      previousSelectedUnitLayout
-#              previousUnitName
-#              previousUnitValue
-#              previousUnitSymbol
-#      unitsAndDescriptionPane
-#              unitListScrolledWindow
-#                      unitsView
-#              unitDescriptionScrolledWindow
-#                      unitDescription
-#      searchLayout is the search box
+                               evil_globals.calcsuppress = 1
+                               func, arg = unit_dic[unitName.get_text()][0]
+                               unitValue.set_text(str(apply(func.from_base, (base, arg, ))))
+                               evil_globals.calcsuppress = 0
+
+
 def main():
        global mainWindow
        global categoryView
@@ -594,7 +578,7 @@ def main():
        global categoryColumn
        global toggleShortList
 
-       logging.basicConfig(level=logging.DEBUG)
+       logging.basicConfig(level = logging.DEBUG)
 
        try:
                os.makedirs(constants._data_path_)
@@ -627,7 +611,7 @@ def main():
                #Retrieving previous window settings from ~/.gonvert/window.dat
                saved_window = pickle.load(open(windowDatPath, "r"))
                #If the 'size' has been stored, then extract size from saved_window.
-               if saved_window.has_key('size'):
+               if 'size' in saved_window:
                        a, b = saved_window['size']
                        mainWindow.resize(a, b)
                else:
@@ -639,7 +623,7 @@ def main():
                #mainWindow.maximize()
                pass
 
-       mainWindow.set_title('gonvert- %s - Unit Conversion Utility' % constants.__version__);
+       mainWindow.set_title('gonvert- %s - Unit Conversion Utility' % constants.__version__)
        iconPath = pixmapspath + '/gonvert.png'
        if os.path.exists(iconPath):
                mainWindow.set_icon(gtk.gdk.pixbuf_new_from_file(iconPath))
@@ -667,35 +651,36 @@ def main():
                "on_mainWindow_size_allocate": app_size_changed,
                "on_shortlistcheck_toggled": shortlist_changed,
                "on_toggleShortList_activate": edit_shortlist,
-        }
+       }
 
-       widgets.signal_autoconnect (dic);
+       widgets.signal_autoconnect(dic)
        mainWindow.connect("destroy", exitprogram)
 
-       def change_menu_label(labelname,newtext):
+       def change_menu_label(labelname, newtext):
                item_label = widgets.get_widget(labelname).get_children()[0]
                item_label.set_text(newtext)
-       def change_label(labelname,newtext):
+
+       def change_label(labelname, newtext):
                item_label = widgets.get_widget(labelname)
                item_label.set_text(newtext)
 
-       change_menu_label('fileMenuItem',_('File'))
-       change_menu_label('exitMenuItem',_('Exit'))
-       change_menu_label('toolsMenuItem',_('Tools'))
-       change_menu_label('clearSelectionMenuItem',_('Clear selections'))
-       change_menu_label('writeUnitsMenuItem',_('Write Units'))
-       change_menu_label('helpMenuItem',_('Help'))
-       change_menu_label('aboutMenuItem',_('About'))
+       change_menu_label('fileMenuItem', _('File'))
+       change_menu_label('exitMenuItem', _('Exit'))
+       change_menu_label('toolsMenuItem', _('Tools'))
+       change_menu_label('clearSelectionMenuItem', _('Clear selections'))
+       change_menu_label('writeUnitsMenuItem', _('Write Units'))
+       change_menu_label('helpMenuItem', _('Help'))
+       change_menu_label('aboutMenuItem', _('About'))
 
-       change_menu_label('findButton',_('Find'))
+       change_menu_label('findButton', _('Find'))
 
        shortlistcheck = widgets.get_widget('shortlistcheck')
        toggleShortList = widgets.get_widget('toggleShortList')
 
-       categoryView = widgets.get_widget('categoryView' )
+       categoryView = widgets.get_widget('categoryView')
 
        unitsView = widgets.get_widget('unitsView')
-       unitsView_selection=unitsView.get_selection()
+       unitsView_selection = unitsView.get_selection()
 
        unitName = widgets.get_widget('unitName')
        unitValue = widgets.get_widget('unitValue')
@@ -710,88 +695,88 @@ def main():
        versionlabel = widgets.get_widget('versionlabel')
        versionlabel.set_text(constants.__version__)
 
-       unitSymbol =widgets.get_widget('unitSymbol')
-       previousUnitSymbol =widgets.get_widget('previousUnitSymbol')
+       unitSymbol = widgets.get_widget('unitSymbol')
+       previousUnitSymbol = widgets.get_widget('previousUnitSymbol')
 
-       unitDescription = widgets.get_widget('unitDescription' )
+       unitDescription = widgets.get_widget('unitDescription')
 
        findEntry = widgets.get_widget('findEntry')
        findLabel = widgets.get_widget('findLabel')
 
        #insert a categoryColumnumn into the units list even though the heading will not be seen
        renderer = gtk.CellRendererText()
-       unitNameColumn = gtk.TreeViewColumn( _('Unit Name'), renderer )
-       unitNameColumn.set_property( 'resizable', 1 )
-       unitNameColumn.add_attribute( renderer, 'text', 0 )
+       unitNameColumn = gtk.TreeViewColumn(_('Unit Name'), renderer)
+       unitNameColumn.set_property('resizable', 1)
+       unitNameColumn.add_attribute(renderer, 'text', 0)
        unitNameColumn.set_clickable(True)
-       unitNameColumn.connect("clicked",click_unit_column)
-       unitsView.append_column( unitNameColumn )
+       unitNameColumn.connect("clicked", click_unit_column)
+       unitsView.append_column(unitNameColumn)
 
-       unitValueColumn = gtk.TreeViewColumn( _('Value'), renderer )
-       unitValueColumn.set_property( 'resizable', 1 )
-       unitValueColumn.add_attribute( renderer, 'text', 1 )
+       unitValueColumn = gtk.TreeViewColumn(_('Value'), renderer)
+       unitValueColumn.set_property('resizable', 1)
+       unitValueColumn.add_attribute(renderer, 'text', 1)
        unitValueColumn.set_clickable(True)
-       unitValueColumn.connect("clicked",click_unit_column)
-       unitsView.append_column( unitValueColumn )
+       unitValueColumn.connect("clicked", click_unit_column)
+       unitsView.append_column(unitValueColumn)
 
-       unitSymbolColumn = gtk.TreeViewColumn( _('Units'), renderer )
-       unitSymbolColumn.set_property( 'resizable', 1 )
-       unitSymbolColumn.add_attribute( renderer, 'text', 2 )
+       unitSymbolColumn = gtk.TreeViewColumn(_('Units'), renderer)
+       unitSymbolColumn.set_property('resizable', 1)
+       unitSymbolColumn.add_attribute(renderer, 'text', 2)
        unitSymbolColumn.set_clickable(True)
-       unitSymbolColumn.connect("clicked",click_unit_column)
-       unitsView.append_column( unitSymbolColumn )
+       unitSymbolColumn.connect("clicked", click_unit_column)
+       unitsView.append_column(unitSymbolColumn)
 
        #Insert a column into the category list even though the heading will not be seen
        renderer = gtk.CellRendererText()
-       categoryColumn = gtk.TreeViewColumn( 'Title', renderer )
-       categoryColumn.set_property( 'resizable', 1 )
-       categoryColumn.add_attribute( renderer, 'text', 0 )
-       categoryView.append_column( categoryColumn )
+       categoryColumn = gtk.TreeViewColumn('Title', renderer)
+       categoryColumn.set_property('resizable', 1)
+       categoryColumn.add_attribute(renderer, 'text', 0)
+       categoryView.append_column(categoryColumn)
 
        categoryModel = gtk.ListStore(gobject.TYPE_STRING)
        categoryView.set_model(categoryModel)
        #colourize each row differently for easier reading
-       categoryView.set_property( 'rules_hint',1)
+       categoryView.set_property('rules_hint', 1)
 
        #Populate the catagories list
        keys = unit_data.list_dic.keys()
        keys.sort()
        for key in keys:
                iter = categoryModel.append()
-               categoryModel.set(iter,0,key)
+               categoryModel.set(iter, 0, key)
 
-       ToolTips=gtk.Tooltips()
+       ToolTips = gtk.Tooltips()
        findButton = widgets.get_widget('findButton')
-       ToolTips.set_tip(findButton,_(u'Find unit (F6)'))
+       ToolTips.set_tip(findButton, _(u'Find unit (F6)'))
 
        #Restore selections from previously saved settings if it exists and is valid.
-       historical_catergory_found=False
+       historical_catergory_found = False
        selectionsDatPath = "/".join((constants._data_path_, "selections.dat"))
        if os.path.exists(selectionsDatPath):
                #Retrieving previous selections from ~/.gonvert/selections.dat
-               selections=pickle.load(open(selectionsDatPath,'r'))
+               selections = pickle.load(open(selectionsDatPath, 'r'))
                #Restoring previous selections.
                #
                #Make a list of categories to determine which one to select
-               categories=unit_data.list_dic.keys()
+               categories = unit_data.list_dic.keys()
                categories.sort()
                #
                #If the 'selected_unts' has been stored, then extract evil_globals.selected_units from selections.
-               if selections.has_key('evil_globals.selected_units'):
-                       evil_globals.selected_units=selections['evil_globals.selected_units']
+               if 'evil_globals.selected_units' in selections:
+                       evil_globals.selected_units = selections['evil_globals.selected_units']
                #Make sure that the 'evil_globals.selected_category' has been stored.
-               if selections.has_key('evil_globals.selected_category'):
+               if 'evil_globals.selected_category' in selections:
                        #Match an available category to the previously selected category.
                        for counter in range(len(categories)):
-                               if selections['evil_globals.selected_category']==categories[counter]:
+                               if selections['evil_globals.selected_category'] == categories[counter]:
                                        # Restore the previously selected category.
-                                       categoryView.set_cursor(counter, categoryColumn, False )
+                                       categoryView.set_cursor(counter, categoryColumn, False)
                                        categoryView.grab_focus()
-                       historical_catergory_found=True
+                       historical_catergory_found = True
 
        if not historical_catergory_found:
                print "Couldn't find saved category, using default."
-               #If historical records were not kept then default to 
+               #If historical records were not kept then default to
                # put the focus on the first category
                categoryView.set_cursor(0, categoryColumn, False)
                categoryView.grab_focus()