[cmor] 06/13: fix typo

[Alastair McKinstry]

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

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

commit 41144f5921eaf250af9d7535c19521ed8d6c8ad3
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Dec 20 13:03:55 2016 +0000

    fix typo
---
 debian/patches/python3.patch | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 6932229..4f56222 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -2644,11 +2644,7 @@ Index: cmor-3.2.1/Lib/__init__.py
 ===================================================================
 --- cmor-3.2.1.orig/Lib/__init__.py
 +++ cmor-3.2.1/Lib/__init__.py
-@@ -1,12 +1,12 @@
--import os
-+mport os
- import sys
- xml_pth = os.path.join(sys.prefix,"share","udunits","udunits2.xml")
+@@ -4,9 +4,9 @@ xml_pth = os.path.join(sys.prefix,"share
  if os.path.exists(xml_pth):
      os.environ["UDUNITS2_XML_PATH"] = xml_pth
  
@@ -3180,7 +3176,7 @@ Index: cmor-3.2.1/Test/test_checker_works.py
 +++ cmor-3.2.1/Test/test_checker_works.py
 @@ -1,7 +1,7 @@
 -####
-+--- Test/test_checker_works.pylint(original)0;95;c####
++# --- Test/test_checker_works.pylint(original)0;95;c####
  # This is trying to test all that cmor_checker catches all the possible failures
  ###
 -
@@ -3209,17 +3205,19 @@ Index: cmor-3.2.1/Test/test_checker_works.py
      os.remove("crapo.txt")
      cmor.checkCMOR(fo,F,"Tables/CMIP5_6hrLev",dodrs=False)
 -    raise Exception,"missing var att %s test failed" % att
+-except cmor.check_CMOR_compliant.CMORError,err:
 +    raise Exception("missing var att %s test failed" % att)
- except cmor.check_CMOR_compliant.CMORError,err:
++except cmor.check_CMOR_compliant.CMORError as err:
      if str(err).find('variable attribute cell_measures should be')>-1:
 -        print 'Failed with CMOR error as expected:',err
 +        print ('Failed with CMOR error as expected:',err)
          pass
      else:
 -        raise Exception,"Checker of variable type failed for the wrong reason! %s" % (err)
-+        raise Exception("Checker of variable type failed for the wrong reason! %s" % (err))
- except Exception,err:
+-except Exception,err:
 -    raise Exception,err
++        raise Exception("Checker of variable type failed for the wrong reason! %s" % (err))
++except Exception as err:
 +    raise Exception(err)
  os.remove(F)
  

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