[magics] 01/03: Fixes to python3

[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 78ee5b97eab4fe47ab6830c2dc350aa41e4af2b5
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Apr 20 17:16:49 2017 +0100

    Fixes to python3
---
 debian/patches/python3.patch | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 58ed874..3e1ed95 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -993,7 +993,8 @@ Index: magics++-2.32.0/python/Magics/macro.py
 +from six import iteritems
 +
  import os
- import Magics
+-import Magics
++from . import Magics
  import numpy
  
 +try:
@@ -1849,8 +1850,8 @@ Index: magics++-2.32.0/python/Magics/toolbox.py
 @@ -1,13 +1,11 @@
 -
 -import macro
-+from __future__ import print function
-+from , import macro
++from __future__ import print_function
++from . import macro
  
  def substitute(default, user):
      out = default
@@ -1979,3 +1980,10 @@ Index: magics++-2.32.0/utils/plumes.py
  
          return 1
  
+Index: magics++-2.32.0/python/Magics/__init__.py
+===================================================================
+--- magics++-2.32.0.orig/python/Magics/__init__.py
++++ magics++-2.32.0/python/Magics/__init__.py
+@@ -1 +1 @@
+-from Magics import *
++from .Magics import *

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