[magics] 58/63: indentation fixes

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository magics.

commit 83bec3020cb76eb09cc46cc6940f7731c6ef0e13
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Dec 8 08:02:34 2016 +0000

    indentation fixes
---
 debian/patches/python3.patch | 96 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 85 insertions(+), 11 deletions(-)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 0eb0247..89f9459 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -1827,24 +1827,57 @@ Index: magics++-2.30.0/python/Magics/toolbox.py
 ===================================================================
 --- magics++-2.30.0.orig/python/Magics/toolbox.py
 +++ magics++-2.30.0/python/Magics/toolbox.py
-@@ -1,5 +1,6 @@
+@@ -1,39 +1,36 @@
 +from __future__ import print_function
++
++from . import macro
  
 -import macro
-+from . import macro
  
  def substitute(default, user):
      out = default
-@@ -7,7 +8,7 @@ def substitute(default, user):
+-    if user != None:
++    if user is not None:
          for key in user:
              out[key] = user[key]
-     
+-    
 -    print out
-+    print (out)
- 
+-
++    print(out)
      return out
  
-@@ -159,7 +160,7 @@ defaults = { "eps" :
+ 
+-
+-
+ def xyplot(data, contour=None, output=None):
+ 
+-
+     default = {
+-       "contour" : { } 
++       "contour": {} 
+     }
+ 
+-    #Setting the cartesian view
+-    projection = macro.mmap(subpage_map_projection = 'cartesian',
++    # Setting the cartesian view
++    projection = macro.mmap(subpage_map_projection='cartesian',
+                 subpage_x_automatic = 'on',
+                 subpage_y_automatic = 'on',
+                      )
+-    #Vertical axis
++    # Vertical axis
+     vertical = macro.maxis(axis_orientation = "vertical",
+                      axis_grid =  "on",
+                      axis_grid_colour = "grey",
+                      axis_grid_thickness = 1,
+                      axis_grid_line_style = "dot")
+ 
+-    #Horizontal axis
++    # Horizontal axis
+     horizontal = macro.maxis(axis_orientation = "horizontal",
+                      axis_grid =  "on",
+                      axis_grid_colour = "grey",
+@@ -159,7 +156,7 @@ defaults = { "eps" :
  
  def epsgram(parameter, input, **args):
      
@@ -1853,7 +1886,7 @@ Index: magics++-2.30.0/python/Magics/toolbox.py
      
      actions = []
     
-@@ -185,10 +186,10 @@ def epsgram(parameter, input, **args):
+@@ -185,11 +182,11 @@ def epsgram(parameter, input, **args):
      actions.append(vertical)
      actions.append(horizontal)
      
@@ -1862,11 +1895,52 @@ Index: magics++-2.30.0/python/Magics/toolbox.py
      
      if "clim" in args  : 
 -    	print "FILE--->", data
-+    	print ("FILE--->", data)
-     	clim = macro.mwrepjson(
+-    	clim = macro.mwrepjson(
++        print ("FILE--->", data)
++        clim = macro.mwrepjson(
                              wrepjson_family =  "eps",
                              wrepjson_keyword =  "clim",
-@@ -239,10 +240,10 @@ def epsgram(parameter, input, **args):
+                             wrepjson_input_filename = input,
+@@ -205,9 +202,7 @@ def epsgram(parameter, input, **args):
+         actions.append(shade)
+     
+     actions.append(data)
+-    actions.append(graph)           
+-
+-
++    actions.append(graph)
+     text = macro.mtext(
+                     text_colour =  "navy",
+                     text_font_size = font_size*2,
+@@ -217,32 +212,23 @@ def epsgram(parameter, input, **args):
+                     "<json_info key='product_info'/><json_info key='date'/>",
+                     "<font size='0.5' colour='white'>.</font>",
+                     "<json_info key='parameter_info'/>",]
+-
+                 )
+-
+     actions.append(text)
+     
+     if "output" in args != "" :
+-    	#Setting of the output file name
+-		png = macro.output(output_formats = ['png'], 
+-			output_name_first_page_number = "off",
+-			output_name = args["output"])
+-
+-		return macro._plot(
+-			png,
+-            actions
+-    	)	
+-
+-    return macro.plot(
+-            actions
+-    )
++        # Setting of the output file name
++        png = macro.output(output_formats = ['png'], 
++			   output_name_first_page_number = "off",
++			   output_name = args["output"])
++        return macro._plot(png,actions)	
++    return macro.plot(actions)
  
  def epsclimgram(**kw):
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git