small bugfix

Author: pavolgaj

gui_tools.py

@@ -104,30 +104,30 @@ def __init__(self,master,**kw):
         AutoScroll.__init__(self,master)
 
 def set_foregroundcolor(ax, color):
-     '''For the specified axes, sets the color of the frame, major ticks,
-         tick labels, axis labels, title and legend
-     '''
-     for tl in ax.get_xticklines() + ax.get_yticklines():
-         tl.set_color(color)
-     for spine in ax.spines:
-         ax.spines[spine].set_edgecolor(color)
-     for tick in ax.xaxis.get_major_ticks():
-         tick.label1.set_color(color)
-     for tick in ax.yaxis.get_major_ticks():
-         tick.label1.set_color(color)
-     ax.axes.xaxis.label.set_color(color)
-     ax.axes.yaxis.label.set_color(color)
-     ax.axes.xaxis.get_offset_text().set_color(color)
-     ax.axes.yaxis.get_offset_text().set_color(color)
-     ax.axes.title.set_color(color)
-     lh = ax.get_legend()
-     if lh != None:
-         lh.get_title().set_color(color)
-         lh.legendPatch.set_edgecolor('none')
-         labels = lh.get_texts()
-         for lab in labels:
-             lab.set_color(color)
-     for tl in ax.get_xticklabels():
-         tl.set_color(color)
-     for tl in ax.get_yticklabels():
-         tl.set_color(color)
+    '''For the specified axes, sets the color of the frame, major ticks,
+        tick labels, axis labels, title and legend
+    '''
+    for tl in ax.get_xticklines() + ax.get_yticklines():
+        tl.set_color(color)
+    for spine in ax.spines:
+        ax.spines[spine].set_edgecolor(color)
+    for tick in ax.xaxis.get_major_ticks():
+        tick.label1.set_color(color)
+    for tick in ax.yaxis.get_major_ticks():
+        tick.label1.set_color(color)
+    ax.axes.xaxis.label.set_color(color)
+    ax.axes.yaxis.label.set_color(color)
+    ax.axes.xaxis.get_offset_text().set_color(color)
+    ax.axes.yaxis.get_offset_text().set_color(color)
+    ax.axes.title.set_color(color)
+    lh = ax.get_legend()
+    if lh != None:
+        lh.get_title().set_color(color)
+        lh.legendPatch.set_edgecolor('none')
+        labels = lh.get_texts()
+        for lab in labels:
+            lab.set_color(color)
+    for tl in ax.get_xticklabels():
+        tl.set_color(color)
+    for tl in ax.get_yticklabels():
+        tl.set_color(color)

main.py

@@ -53,9 +53,9 @@ def sort(zoznam):
     objSort=[]
     order={}
     for x in zoznam:
-        for i in range(len(x)):
+        for i,xi in enumerate(x):
             try:
-                int(x[i])
+                int(xi)
                 break
             except: pass
         order[x[:i]+x[i:].rjust(10,'0')]=x

objects_import.py

@@ -102,7 +102,7 @@ def sipsI(name):
     constellations=stars.load()
     abbrevConst={x.lower():y for x,y in stars.abbrev().items()}   #malym -> osetrenie problem s velkostou pismen
 
-    skratky=[x.lower() for x in constellations.keys()]        #malym -> osetrenie problem s velkostou pismen
+    skratky=[x.lower() for x in constellations]        #malym -> osetrenie problem s velkostou pismen
     objects=objClass.objects(constellations)
     f=open(name,'r')
     group=''    #type of object in catalog (M,NGC etc.)
@@ -130,11 +130,9 @@ def sipsI(name):
             except: pass
             if d.strip().lower() in skratky:
                 const0=d.strip()
-                continue
             elif d.strip().lower() in abbrevConst:
                 const0=abbrevConst[d.strip().lower()]
-                continue
-            typ=d
+            else: typ=d
         size=''
         if '(' in line: note=line[line.find('(')+1:line.find(')')]
         else: note=''

stars.py

@@ -20,28 +20,28 @@ def sid_time(jd):
     return sid
 
 def printDMS(x):
-        #output in format d:m:s
-        sgn=''
-        if np.sign(x)<0: sgn='-'
-        x=abs(x)
-        d=int(abs(x))
-        m=int(round((abs(x)-d)*60.,3))
-        s=abs(round((abs(x)-d-m/60.)*3600.,2))
-        xx=sgn+str(d).rjust(2,'0')+':'+str(m).rjust(2,'0')+':'+('%.2f' %s).rjust(5,'0')
-        return xx
+    '''output in format d:m:s'''
+    sgn=''
+    if np.sign(x)<0: sgn='-'
+    x=abs(x)
+    d=int(abs(x))
+    m=int(round((abs(x)-d)*60.,3))
+    s=abs(round((abs(x)-d-m/60.)*3600.,2))
+    xx=sgn+str(d).rjust(2,'0')+':'+str(m).rjust(2,'0')+':'+('%.2f' %s).rjust(5,'0')
+    return xx
 
 def readDMS(x,deg=True):
-        #input in format d:m:s
-        sgn=1
-        if x[0]=='-':
-            sgn=-1
-            x=x[1:]
-        d=int(x[:x.find(':')])
-        x=x[x.find(':')+1:]
-        m=int(x[:x.find(':')])
-        s=float(x[x.find(':')+1:])
-        if deg: return sgn*(d+m/60.+s/3600.)
-        else: return sgn*d,m,s
+    '''input in format d:m:s'''
+    sgn=1
+    if x[0]=='-':
+        sgn=-1
+        x=x[1:]
+    d=int(x[:x.find(':')])
+    x=x[x.find(':')+1:]
+    m=int(x[:x.find(':')])
+    s=float(x[x.find(':')+1:])
+    if deg: return sgn*(d+m/60.+s/3600.)
+    else: return sgn*d,m,s
 
 class star:
     def __init__(self,name,ra,dec,mag,size='0',typ='NA',note='',const=''):
@@ -58,7 +58,7 @@ def __init__(self,name,ra,dec,mag,size='0',typ='NA',note='',const=''):
     def altAz(self,jd,lon,lat):
         #type of output (same as input - number, list, numpy.array)
         out_type='lst'
-        if (isinstance(jd,int) or isinstance(jd,float)):
+        if isinstance(jd,(int,float)):
             #all input args are numbers
             out_type='num'
 
@@ -214,7 +214,7 @@ def testPoint(self,ra,dec):
             ra,dec=self._transform(ra,dec,coef)
             ra0,dec0=self._transform(ra0,dec0,coef)
 
-            for i in range(len(ra0)):
+            for i,ra0i in enumerate(ra0):
                 poly.append([ra0[i],dec0[i]])
 
             if ra>max(ra0) or ra<min(ra0): continue