r17863 - /trunk/graphics/wizards/dipole_pair/VectorFieldPlot.py -- October 16, 2012 - 14:58

Author: bugman
Date: Tue Oct 16 14:58:50 2012
New Revision: 17863

URL: http://svn.gna.org/viewcvs/relax?rev=17863&view=rev
Log:
Python 3 fixes for the script for generating plots of magnetic field lines.

The command used was:
2to3 -w graphics/wizards/dipole_pair/VectorFieldPlot.py


Modified:
    trunk/graphics/wizards/dipole_pair/VectorFieldPlot.py

Modified: trunk/graphics/wizards/dipole_pair/VectorFieldPlot.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/graphics/wizards/dipole_pair/VectorFieldPlot.py?rev=17863&r1=17862&r2=17863&view=diff
==============================================================================
--- trunk/graphics/wizards/dipole_pair/VectorFieldPlot.py (original)
+++ trunk/graphics/wizards/dipole_pair/VectorFieldPlot.py Tue Oct 16 14:58:50 
2012
@@ -205,7 +205,7 @@
     def __get_arrowname(self, fillcolor='#000000'):
         if 'arrows' not in dir(self):
             self.arrows = {}
-        if fillcolor not in self.arrows.iterkeys():
+        if fillcolor not in iter(self.arrows.keys()):
             arrow = etree.SubElement(self.__get_defs(), 'path')
             self.arrows[fillcolor] = arrow
             arrow.set('id', 'arrow' + str(len(self.arrows)))
@@ -544,7 +544,7 @@
             obj = etree.SubElement(self.symbols, name)
         else:
             obj = etree.SubElement(group, name)
-        for i, j in params.iteritems():
+        for i, j in params.items():
             obj.set(str(i), str(j))
         return obj
  
@@ -561,7 +561,7 @@
         outfile.write(etree.tostring(self.svg, xml_declaration=True,
             pretty_print=True, encoding='utf-8'))
         outfile.close()
-        print 'image written to', filename + '.svg'
+        print('image written to', filename + '.svg')
  
  
  
@@ -606,7 +606,7 @@
         if v != None: d_near *= 1.3 - cosv(v, self.first_point - p)
         type_near = 'start'
         mon = []
-        for ptype, poles in self.field.elements.iteritems():
+        for ptype, poles in self.field.elements.items():
             if ptype not in ['monopoles', 'dipoles'] or len(poles) == 0:
                 continue
             for pole in poles:
@@ -679,7 +679,7 @@
                             (dpole * abs(cv) < xtol) and (l > 1e-3)):
                             # path is closed
                             nodes[-1]['v_out'] = None
-                            print 'closed at', pretty_vec(p)
+                            print('closed at', pretty_vec(p))
                             break
                         elif (h > 0.99 * dpole and (cv > 0.9 or
                             (cv > 0. and dpole * abs(sv) < ytol))):
@@ -755,7 +755,7 @@
                         # create a corner
                         # use second-order formulas instead of runge-kutta
                         p += hc * v2
-                        print 'corner at', pretty_vec(p)
+                        print('corner at', pretty_vec(p))
                         v = vnorm(2. * v2 - v)
                         
nodes.append({'p':p.copy(),'v_in':v*hc,'corner':True})
                         l += h
@@ -779,7 +779,7 @@
                         adif = angle_dif(a1, a0)
                         if (abs(adif) / (.8*hh)**2 > corner_limit or
                             abs(a0) + abs(a1) >= pi / 2.):
-                            print 'end edge at', pretty_vec(p)
+                            print('end edge at', pretty_vec(p))
                             # direction after corner changes again -> end 
line
                             nodes[-1]['v_out'] = None
                             break
@@ -829,7 +829,7 @@
                         h = vabs(nodes[-1]['p'] - p)
                         nodes[-2]['v_out'] = f(nodes[-2]['p']) * h
                         nodes[-1]['v_in'] = f(nodes[-1]['p']) * h
-                    print 'stopped at', pretty_vec(nodes[-1]['p'])
+                    print('stopped at', pretty_vec(nodes[-1]['p']))
                     break 
  
             # adapt step carefully
@@ -846,9 +846,9 @@
  
         nodes[-1]['v_out'] = None
         if i == maxn:
-            print maxn, 'integration steps exceeded at', pretty_vec(p)
+            print(maxn, 'integration steps exceeded at', pretty_vec(p))
         if l >= maxr:
-            print 'integration boundary', str(maxr), 'exceeded at', 
pretty_vec(p)
+            print('integration boundary', str(maxr), 'exceeded at', 
pretty_vec(p))
         return nodes
  
     def __is_loop(self, nodes, path_close_tol):
@@ -995,7 +995,7 @@
             if num_success > 2 and N < N_old: num_success = 2
             if num_success >= 3: break
             if num >= 25:
-                print 'polyline creation did not converge after', num, 
'tries!'
+                print('polyline creation did not converge after', num, 
'tries!')
                 break
             ratios = [ratio * N / n for ratio in ratios]
  
@@ -1114,7 +1114,7 @@
     '''
     def __init__ (self, elements={}):
         self.elements = {}
-        for name, params in elements.iteritems():
+        for name, params in elements.items():
             self.add_element(name, params)
  
     '''