From a052e0851cc23098d6f1caf0492fe9dd889af877 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Fri, 30 Oct 2009 22:19:32 -0500 Subject: [PATCH 1/1] Lint suggestions --- Makefile | 81 --------------------------------------- original.mak | 81 +++++++++++++++++++++++++++++++++++++++ src/converters.py | 104 +++++++++++++++++++++++++------------------------- src/gonvert_glade.py | 3 +- 4 files changed, 134 insertions(+), 135 deletions(-) delete mode 100755 Makefile create mode 100755 original.mak diff --git a/Makefile b/Makefile deleted file mode 100755 index 1b02a5e..0000000 --- a/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -NAME=gonvert - -#Get version number from source file -VERSION=$(shell head -3 $(NAME) | grep version | cut -d\" -f2) - -#DESTDIR can be defined when calling make ie. make install DESTDIR=$RPM_BUILD_ROOT -prefix = /usr/local -bindir = $(prefix)/bin -datadir = $(prefix)/share -docdir = $(datadir)/doc - -DESTDIR = - -all: - -install: - install -D -m0755 gonvert $(DESTDIR)$(bindir)/gonvert - install -D -m0644 gonvert.glade $(DESTDIR)$(datadir)/gonvert/gonvert.glade - install -d -m0755 $(DESTDIR)$(datadir)/pixmaps/ - install -m0644 pixmaps/*.png $(DESTDIR)$(datadir)/pixmaps/ - install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/gnome/apps/Utilities/gonvert.desktop - install -d -m0755 $(DESTDIR)$(docdir)/gonvert/ - install -m0644 doc/* $(DESTDIR)$(docdir)/gonvert/ - -install_pl: - install -D -m0755 gonvert $(DESTDIR)$(bindir)/gonvert - install -D -m0644 gonvert.glade $(DESTDIR)$(datadir)/gonvert/gonvert.glade - install -d -m0755 $(DESTDIR)$(datadir)/pixmaps/ - install -m0644 pixmaps/*.png $(DESTDIR)$(datadir)/pixmaps/ - install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/gnome/apps/Utilities/gonvert.desktop - install -d -m0755 $(DESTDIR)$(docdir)/gonvert/ - install -m0644 doc/* $(DESTDIR)$(docdir)/gonvert/ - install -m0644 i18n/pl_messages.gmo /usr/share/locale/pl/LC_MESSAGES/gonvert.mo - -uninstall: - #specify project name manually to prevent removal of all directories - rm -f $(bindir)/gonvert - rm -rf $(datadir)/gonvert* - rm -rf $(docdir)/gonvert* - rm -f /usr/share/gnome/apps/Utilities/$(NAME).desktop - rm -f /usr/share/pixmaps/$(NAME).png - -uninstall_pl: - #specify project name manually to prevent removal of all directories - rm -f $(bindir)/gonvert - rm -rf $(datadir)/gonvert* - rm -rf $(docdir)/gonvert* - rm -f /usr/share/gnome/apps/Utilities/$(NAME).desktop - rm -f /usr/share/pixmaps/$(NAME).png - rm -f /usr/share/locale/pl/LC_MESSAGES/gonvert.mo - -dist: - if test -d "$(NAME)-$(VERSION)"; then rm -rf $(NAME)-$(VERSION); fi - if test -f "$(NAME)-$(VERSION).tar.gz"; then rm -f $(NAME)-$(VERSION).tar.gz; fi - mkdir $(NAME)-$(VERSION) - cp Makefile $(NAME)-$(VERSION) - cp messages.pot $(NAME)-$(VERSION) - cp -R i18n $(NAME)-$(VERSION) - cp -R doc $(NAME)-$(VERSION) - cp $(NAME) $(NAME)-$(VERSION) - cp $(NAME).glade $(NAME)-$(VERSION) - cp $(NAME).spec $(NAME)-$(VERSION) - cp $(NAME).desktop $(NAME)-$(VERSION) - cp -R pixmaps $(NAME)-$(VERSION) - tar cvzf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) - rm -rf $(NAME)-$(VERSION) - -rpm: - #You will most likely have to be root for this to work - sed '/Version/s/replaceme/$(VERSION)/' gonvert.spec.skel > gonvert.spec - cp $(NAME).spec /usr/src/redhat/SPECS/$(NAME).spec - cp $(NAME)-$(VERSION).tar.gz /usr/src/redhat/SOURCES - rpmbuild -ba /usr/src/redhat/SPECS/gonvert.spec - cp /usr/src/redhat/RPMS/noarch/gonvert-$(VERSION)*.rpm ~anthony/web/unihedron/projects/gonvert/downloads - -pub: - #For authors use only - if test -f "$(NAME)"; then cp $(NAME) ~/web/unihedron/projects/gonvert/downloads/$(NAME).pyw; fi - if test -f "$(NAME).glade"; then cp $(NAME).glade ~/web/unihedron/projects/gonvert/downloads; fi - if test -f "$(NAME)-$(VERSION).tar.gz"; then mv -f $(NAME)-$(VERSION).tar.gz ~/web/unihedron/projects/gonvert/downloads; fi - if test -f "doc/CHANGELOG"; then cp -f doc/CHANGELOG ~/web/unihedron/projects/gonvert/CHANGELOG; fi diff --git a/original.mak b/original.mak new file mode 100755 index 0000000..1b02a5e --- /dev/null +++ b/original.mak @@ -0,0 +1,81 @@ +NAME=gonvert + +#Get version number from source file +VERSION=$(shell head -3 $(NAME) | grep version | cut -d\" -f2) + +#DESTDIR can be defined when calling make ie. make install DESTDIR=$RPM_BUILD_ROOT +prefix = /usr/local +bindir = $(prefix)/bin +datadir = $(prefix)/share +docdir = $(datadir)/doc + +DESTDIR = + +all: + +install: + install -D -m0755 gonvert $(DESTDIR)$(bindir)/gonvert + install -D -m0644 gonvert.glade $(DESTDIR)$(datadir)/gonvert/gonvert.glade + install -d -m0755 $(DESTDIR)$(datadir)/pixmaps/ + install -m0644 pixmaps/*.png $(DESTDIR)$(datadir)/pixmaps/ + install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/gnome/apps/Utilities/gonvert.desktop + install -d -m0755 $(DESTDIR)$(docdir)/gonvert/ + install -m0644 doc/* $(DESTDIR)$(docdir)/gonvert/ + +install_pl: + install -D -m0755 gonvert $(DESTDIR)$(bindir)/gonvert + install -D -m0644 gonvert.glade $(DESTDIR)$(datadir)/gonvert/gonvert.glade + install -d -m0755 $(DESTDIR)$(datadir)/pixmaps/ + install -m0644 pixmaps/*.png $(DESTDIR)$(datadir)/pixmaps/ + install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/gnome/apps/Utilities/gonvert.desktop + install -d -m0755 $(DESTDIR)$(docdir)/gonvert/ + install -m0644 doc/* $(DESTDIR)$(docdir)/gonvert/ + install -m0644 i18n/pl_messages.gmo /usr/share/locale/pl/LC_MESSAGES/gonvert.mo + +uninstall: + #specify project name manually to prevent removal of all directories + rm -f $(bindir)/gonvert + rm -rf $(datadir)/gonvert* + rm -rf $(docdir)/gonvert* + rm -f /usr/share/gnome/apps/Utilities/$(NAME).desktop + rm -f /usr/share/pixmaps/$(NAME).png + +uninstall_pl: + #specify project name manually to prevent removal of all directories + rm -f $(bindir)/gonvert + rm -rf $(datadir)/gonvert* + rm -rf $(docdir)/gonvert* + rm -f /usr/share/gnome/apps/Utilities/$(NAME).desktop + rm -f /usr/share/pixmaps/$(NAME).png + rm -f /usr/share/locale/pl/LC_MESSAGES/gonvert.mo + +dist: + if test -d "$(NAME)-$(VERSION)"; then rm -rf $(NAME)-$(VERSION); fi + if test -f "$(NAME)-$(VERSION).tar.gz"; then rm -f $(NAME)-$(VERSION).tar.gz; fi + mkdir $(NAME)-$(VERSION) + cp Makefile $(NAME)-$(VERSION) + cp messages.pot $(NAME)-$(VERSION) + cp -R i18n $(NAME)-$(VERSION) + cp -R doc $(NAME)-$(VERSION) + cp $(NAME) $(NAME)-$(VERSION) + cp $(NAME).glade $(NAME)-$(VERSION) + cp $(NAME).spec $(NAME)-$(VERSION) + cp $(NAME).desktop $(NAME)-$(VERSION) + cp -R pixmaps $(NAME)-$(VERSION) + tar cvzf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) + rm -rf $(NAME)-$(VERSION) + +rpm: + #You will most likely have to be root for this to work + sed '/Version/s/replaceme/$(VERSION)/' gonvert.spec.skel > gonvert.spec + cp $(NAME).spec /usr/src/redhat/SPECS/$(NAME).spec + cp $(NAME)-$(VERSION).tar.gz /usr/src/redhat/SOURCES + rpmbuild -ba /usr/src/redhat/SPECS/gonvert.spec + cp /usr/src/redhat/RPMS/noarch/gonvert-$(VERSION)*.rpm ~anthony/web/unihedron/projects/gonvert/downloads + +pub: + #For authors use only + if test -f "$(NAME)"; then cp $(NAME) ~/web/unihedron/projects/gonvert/downloads/$(NAME).pyw; fi + if test -f "$(NAME).glade"; then cp $(NAME).glade ~/web/unihedron/projects/gonvert/downloads; fi + if test -f "$(NAME)-$(VERSION).tar.gz"; then mv -f $(NAME)-$(VERSION).tar.gz ~/web/unihedron/projects/gonvert/downloads; fi + if test -f "doc/CHANGELOG"; then cp -f doc/CHANGELOG ~/web/unihedron/projects/gonvert/CHANGELOG; fi diff --git a/src/converters.py b/src/converters.py index 90001f1..f85120e 100644 --- a/src/converters.py +++ b/src/converters.py @@ -22,34 +22,34 @@ def makeBase(x, base = len(ALPHA_NUMERIC), table=ALPHA_NUMERIC): >> makeBase(11, 16) 'b' """ - d, m = divmod(x, base) - if not d: - return table[m] - return makeBase(d, base, table) + table[m] + div, mod = divmod(x, base) + if not div: + return table[mod] + return makeBase(div, base, table) + table[mod] # roman numerals roman_group = { - 1: ('i','v'), - 10: ('x','l'), - 100: ('c','d'), - 1000: ('m','A'), - 10000: ('B','C'), + 1: ('i', 'v'), + 10: ('x', 'l'), + 100: ('c', 'd'), + 1000: ('m', 'A'), + 10000: ('B', 'C'), } # functions that convert Arabic digits to roman numerals roman_value = { - 0: lambda i,v,x: '', - 1: lambda i,v,x: i, - 2: lambda i,v,x: i+i, - 3: lambda i,v,x: i+i+i, - 4: lambda i,v,x: i+v, - 5: lambda i,v,x: v, - 6: lambda i,v,x: v+i, - 7: lambda i,v,x: v+i+i, - 8: lambda i,v,x: v+i+i+i, - 9: lambda i,v,x: i+x, + 0: lambda i, v, x: '', + 1: lambda i, v, x: i, + 2: lambda i, v, x: i+i, + 3: lambda i, v, x: i+i+i, + 4: lambda i, v, x: i+v, + 5: lambda i, v, x: v, + 6: lambda i, v, x: v+i, + 7: lambda i, v, x: v+i+i, + 8: lambda i, v, x: v+i+i+i, + 9: lambda i, v, x: i+x, } @@ -72,19 +72,19 @@ def toroman(n): if n < 0: raise NotImplementedError("Value out of roman comprehension") elif n == 0: - '' + pass elif n >= 4000: raise NotImplementedError("Value Out of Range") base = 1 s = '' while n > 0: - i,v = roman_group[base] - base = base * 10 - x,l = roman_group[base] - digit = n % 10 - n = (n-digit)/10 - s = roman_value[digit](i,v,x) + s + i, v = roman_group[base] + base = base * 10 + x, l = roman_group[base] + digit = n % 10 + n = (n-digit)/10 + s = roman_value[digit](i, v, x) + s return s @@ -99,9 +99,9 @@ def fromroman(s, rbase = 1): 15 """ if len(s) == 0: - return 0 + return 0 elif rbase > 1000: - return 0 + return 0 i, v = roman_group[rbase] x, l = roman_group[rbase*10] @@ -131,10 +131,10 @@ def fromroman(s, rbase = 1): class simple_multiplier(object): - def to_base(self,value,multiplier): + def to_base(self, value, multiplier): return value * (multiplier) - def from_base(self,value,multiplier): + def from_base(self, value, multiplier): if multiplier == 0: return 0.0 else: @@ -143,13 +143,13 @@ class simple_multiplier(object): class simple_inverter(object): - def to_base(self,value,multiplier): + def to_base(self, value, multiplier): if value == 0: return 0.0 else: return (multiplier) / value - def from_base(self,value,multiplier): + def from_base(self, value, multiplier): if value == 0: return 0.0 else: @@ -158,10 +158,10 @@ class simple_inverter(object): class simple_gain_offset(object): - def to_base(self,value,(gain,offset)): + def to_base(self, value, (gain, offset)): return (value * (gain)) + offset - def from_base(self,value,(gain,offset)): + def from_base(self, value, (gain, offset)): if gain == 0: return 0.0 else: @@ -170,10 +170,10 @@ class simple_gain_offset(object): class simple_offset_gain(object): - def to_base(self,value,(offset,gain)): + def to_base(self, value, (offset, gain)): return (value + offset) * gain - def from_base(self,value,(offset,gain)): + def from_base(self, value, (offset, gain)): if gain == 0: return 0.0 else: @@ -183,12 +183,12 @@ class simple_offset_gain(object): class slope_offset(object): ''"convert using points on a graph''" - def to_base(self,value,((low_in,high_in),(low_out,high_out))): + def to_base(self, value, ((low_in, high_in), (low_out, high_out))): gain = (high_out-low_out)/(high_in-low_in) offset = low_out - gain*low_in return gain*value+offset - def from_base(self,value,((low_out,high_out),(low_in,high_in))): + def from_base(self, value, ((low_out, high_out), (low_in, high_in))): gain = (high_out-low_out)/(high_in-low_in) offset = low_out - gain*low_in return gain*value+offset @@ -197,23 +197,23 @@ class slope_offset(object): class double_slope_offset(object): ''"convert using points on a graph, graph split into two slopes''" - def to_base(self,value,((low1_in,high1_in),(low1_out,high1_out),(low2_in,high2_in),(low2_out,high2_out))): - if low1_in<=value<=high1_in: + def to_base(self, value, ((low1_in, high1_in), (low1_out, high1_out), (low2_in, high2_in), (low2_out, high2_out))): + if low1_in <= value <= high1_in: gain = (high1_out-low1_out)/(high1_in-low1_in) offset = low1_out - gain*low1_in return gain*value+offset - if low2_in<=value<=high2_in: + if low2_in <= value <= high2_in: gain = (high2_out-low2_out)/(high2_in-low2_in) offset = low2_out - gain*low2_in return gain*value+offset return 0.0 - def from_base(self,value,((low1_in,high1_in),(low1_out,high1_out),(low2_in,high2_in),(low2_out,high2_out))): - if low1_out<=value<=high1_out: + def from_base(self, value, ((low1_in, high1_in), (low1_out, high1_out), (low2_in, high2_in), (low2_out, high2_out))): + if low1_out <= value <= high1_out: gain = (high1_in-low1_in)/(high1_out-low1_out) offset = low1_in - gain*low1_out return gain*value+offset - if low2_out<=value<=high2_out: + if low2_out <= value <= high2_out: gain = (high2_in-low2_in)/(high2_out-low2_out) offset = low2_in - gain*low2_out return gain*value+offset @@ -222,7 +222,7 @@ class double_slope_offset(object): class base_converter(object): - def to_base(self,value,base): + def to_base(self, value, base): """ Convert from any base to base 10 (decimal) """ @@ -233,25 +233,25 @@ class base_converter(object): result = long(result + long(long(ALPHA_NUMERIC.find(x))*(long(base)**long(position)))) return result - def from_base(self,value,base): + def from_base(self, value, base): """ Convert from decimal to any base """ - return makeBase(value,base) + return makeBase(value, base) class roman_numeral(object): - def to_base(self,value,junk): + def to_base(self, value, junk): """ Convert from roman numeral to base 10 (decimal) """ - if value=="0": + if value == "0": return 0L else: return fromroman(value) - def from_base(self,value,junk): + def from_base(self, value, junk): """ Convert from decimal to roman numeral """ @@ -264,11 +264,11 @@ class function(object): #value is assumed to be a string #convert from a defined function to base - def to_base(self,value,(to_base,from_base)): + def to_base(self, value, (to_base, from_base)): exec "y="+to_base[:to_base.find('x')]+str(value)+to_base[to_base.find('x')+1:] return y - def from_base(self,value,(to_base,from_base)): + def from_base(self, value, (to_base, from_base)): exec "y="+from_base[:from_base.find('x')]+str(value)+from_base[from_base.find('x')+1:] return y diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py index c9b6ab1..e45d78f 100755 --- a/src/gonvert_glade.py +++ b/src/gonvert_glade.py @@ -3,7 +3,6 @@ import os import pickle -import string import gettext import logging @@ -256,7 +255,7 @@ class Gonvert(object): def _find_first(self): assert len(self._find_result) == 0 assert self._findIndex == 0 - findString = string.lower(string.strip(self._findEntry.get_text())) + findString = self._findEntry.get_text().strip().lower() if not findString: return -- 1.7.9.5