Skip to content

Commit

Permalink
Fix #225 test for unicode or str class
Browse files Browse the repository at this point in the history
  • Loading branch information
dnadeau4 committed Feb 21, 2018
1 parent b763673 commit 62b237d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion Lib/axis.py
Original file line number Diff line number Diff line change
Expand Up @@ -2541,7 +2541,7 @@ def axisMatches(axis, specification):
3. an axis object; will match if it is the same object as axis.
"""
if isinstance(specification, str):
if isinstance(specification, ("".__class__, u"".__class__)):
s = specification.lower()
s = s.strip()
while s[0] == '(':
Expand Down
1 change: 0 additions & 1 deletion regrid2/Lib/mvESMFRegrid.py
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,6 @@ def apply(self, srcData, dstData, rootPe, globalIndexing=False, **args):

self.regridObj(self.srcFld.field, self.dstFld.field, zero_region=ESMF.Region.SELECT)


# fill in dstData
if rootPe is None and globalIndexing:
# only fill in the relevant portion of the data
Expand Down

0 comments on commit 62b237d

Please sign in to comment.