[yt-svn] commit/yt: ngoldbaum: Merged in jzuhone/yt (pull request #1852)
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Nov 10 08:52:33 PST 2015
1 new commit in yt:
https://bitbucket.org/yt_analysis/yt/commits/652f3058834c/
Changeset: 652f3058834c
Branch: yt
User: ngoldbaum
Date: 2015-11-10 16:52:05+00:00
Summary: Merged in jzuhone/yt (pull request #1852)
[bugfix] Check against string_types not str
Affected #: 18 files
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/analysis_modules/absorption_spectrum/absorption_spectrum.py
--- a/yt/analysis_modules/absorption_spectrum/absorption_spectrum.py
+++ b/yt/analysis_modules/absorption_spectrum/absorption_spectrum.py
@@ -20,6 +20,7 @@
from .absorption_line import tau_profile
+from yt.extern.six import string_types
from yt.convenience import load
from yt.funcs import get_pbar, mylog
from yt.units.yt_array import YTArray, YTQuantity
@@ -167,7 +168,7 @@
input_fields.append(feature['field_name'])
field_units[feature["field_name"]] = "cm**-3"
- if isinstance(input_file, str):
+ if isinstance(input_file, string_types):
input_ds = load(input_file)
else:
input_ds = input_file
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/convenience.py
--- a/yt/convenience.py
+++ b/yt/convenience.py
@@ -16,6 +16,7 @@
import os, os.path, types
# Named imports
+from yt.extern.six import string_types
from yt.funcs import *
from yt.config import ytcfg
from yt.utilities.parameter_file_storage import \
@@ -33,11 +34,11 @@
:class:`yt.data_objects.api.Dataset` subclass.
"""
candidates = []
- args = [os.path.expanduser(arg) if isinstance(arg, str)
+ args = [os.path.expanduser(arg) if isinstance(arg, string_types)
else arg for arg in args]
valid_file = []
for argno, arg in enumerate(args):
- if isinstance(arg, str):
+ if isinstance(arg, string_types):
if os.path.exists(arg):
valid_file.append(True)
elif arg.startswith("http"):
@@ -73,7 +74,7 @@
if len(candidates) == 0:
if ytcfg.get("yt", "enzo_db") != '' \
and len(args) == 1 \
- and isinstance(args[0], str):
+ and isinstance(args[0], string_types):
erdb = EnzoRunDatabase()
fn = erdb.find_uuid(args[0])
n = "EnzoDataset"
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -18,7 +18,7 @@
import functools
from yt.funcs import *
-from yt.extern.six import add_metaclass
+from yt.extern.six import add_metaclass, string_types
from yt.config import ytcfg
from yt.utilities.cosmology import \
@@ -131,7 +131,7 @@
def __new__(cls, filename=None, *args, **kwargs):
from yt.frontends.stream.data_structures import StreamHandler
- if not isinstance(filename, str):
+ if not isinstance(filename, string_types):
obj = object.__new__(cls)
# The Stream frontend uses a StreamHandler object to pass metadata
# to __init__.
@@ -458,7 +458,7 @@
# concatenation fields.
n = getattr(filter, "name", filter)
self.known_filters[n] = None
- if isinstance(filter, str):
+ if isinstance(filter, string_types):
used = False
for f in filter_registry[filter]:
used = self._setup_filtered_type(f)
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/fields/derived_field.py
--- a/yt/fields/derived_field.py
+++ b/yt/fields/derived_field.py
@@ -14,6 +14,7 @@
import contextlib
import inspect
+from yt.extern.six import string_types
from yt.funcs import \
ensure_list
from .field_exceptions import \
@@ -99,7 +100,7 @@
# handle units
if units is None:
self.units = ''
- elif isinstance(units, str):
+ elif isinstance(units, string_types):
if units.lower() == 'auto':
self.units = None
else:
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/fields/field_info_container.py
--- a/yt/fields/field_info_container.py
+++ b/yt/fields/field_info_container.py
@@ -18,6 +18,7 @@
import numpy as np
from numbers import Number as numeric_type
+from yt.extern.six import string_types
from yt.funcs import mylog, only_on_root
from yt.units.unit_object import Unit
from .derived_field import \
@@ -179,7 +180,7 @@
# field *name* is in there, then the field *tuple*.
units = self.ds.field_units.get(field[1], units)
units = self.ds.field_units.get(field, units)
- if not isinstance(units, str) and args[0] != "":
+ if not isinstance(units, string_types) and args[0] != "":
units = "((%s)*%s)" % (args[0], units)
if isinstance(units, (numeric_type, np.number, np.ndarray)) and \
args[0] == "" and units != 1.0:
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/frontends/gadget/data_structures.py
--- a/yt/frontends/gadget/data_structures.py
+++ b/yt/frontends/gadget/data_structures.py
@@ -15,6 +15,7 @@
# The full license is in the file COPYING.txt, distributed with this software.
#-----------------------------------------------------------------------------
+from yt.extern.six import string_types
from yt.utilities.on_demand_imports import _h5py as h5py
import numpy as np
import stat
@@ -41,7 +42,7 @@
GadgetFieldInfo
def _fix_unit_ordering(unit):
- if isinstance(unit[0], str):
+ if isinstance(unit[0], string_types):
unit = unit[1], unit[0]
return unit
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/frontends/gadget/io.py
--- a/yt/frontends/gadget/io.py
+++ b/yt/frontends/gadget/io.py
@@ -18,6 +18,7 @@
import numpy as np
import os
+from yt.extern.six import string_types
from yt.frontends.owls.io import \
IOHandlerOWLS
from yt.utilities.io_handler import \
@@ -167,7 +168,7 @@
fs = self._field_size
offsets = {}
for field in self._fields:
- if not isinstance(field, str):
+ if not isinstance(field, string_types):
field = field[0]
if not any( (ptype, field) in field_list
for ptype in self._ptypes):
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/frontends/gdf/data_structures.py
--- a/yt/frontends/gdf/data_structures.py
+++ b/yt/frontends/gdf/data_structures.py
@@ -17,6 +17,7 @@
import numpy as np
import weakref
import os
+from yt.extern.six import string_types
from yt.funcs import \
just_one, ensure_tuple
from yt.data_objects.grid_patch import \
@@ -195,7 +196,7 @@
self.field_units[field_name] = just_one(field_conv)
elif 'field_units' in current_field.attrs:
field_units = current_field.attrs['field_units']
- if isinstance(field_units, str):
+ if isinstance(field_units, string_types):
current_field_units = current_field.attrs['field_units']
else:
current_field_units = \
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/frontends/ramses/data_structures.py
--- a/yt/frontends/ramses/data_structures.py
+++ b/yt/frontends/ramses/data_structures.py
@@ -21,6 +21,7 @@
import weakref
from io import BytesIO
+from yt.extern.six import string_types
from yt.funcs import \
mylog
from yt.geometry.oct_geometry_handler import \
@@ -521,7 +522,7 @@
fields = None, storage_filename = None,
units_override=None):
# Here we want to initiate a traceback, if the reader is not built.
- if isinstance(fields, str):
+ if isinstance(fields, string_types):
fields = field_aliases[fields]
'''
fields: An array of hydro variable fields in order of position in the hydro_XXXXX.outYYYYY file
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/frontends/ytdata/data_structures.py
--- a/yt/frontends/ytdata/data_structures.py
+++ b/yt/frontends/ytdata/data_structures.py
@@ -241,7 +241,7 @@
def _parse_parameter_file(self):
super(YTSpatialPlotDataset, self)._parse_parameter_file()
if self.parameters["container_type"] == "proj":
- if isinstance(self.parameters["weight_field"], str) and \
+ if isinstance(self.parameters["weight_field"], string_types) and \
self.parameters["weight_field"] == "None":
self.parameters["weight_field"] = None
elif isinstance(self.parameters["weight_field"], np.ndarray):
@@ -605,7 +605,7 @@
def _parse_parameter_file(self):
super(YTGridDataset, self)._parse_parameter_file()
- if isinstance(self.parameters["weight_field"], str) and \
+ if isinstance(self.parameters["weight_field"], string_types) and \
self.parameters["weight_field"] == "None":
self.parameters["weight_field"] = None
elif isinstance(self.parameters["weight_field"], np.ndarray):
@@ -639,7 +639,7 @@
self.parameters[range_name+"_units"]))
bin_field = "%s_field" % ax
- if isinstance(self.parameters[bin_field], str) and \
+ if isinstance(self.parameters[bin_field], string_types) and \
self.parameters[bin_field] == "None":
self.parameters[bin_field] = None
elif isinstance(self.parameters[bin_field], np.ndarray):
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/funcs.py
--- a/yt/funcs.py
+++ b/yt/funcs.py
@@ -626,7 +626,7 @@
if isinstance(length, numeric_type):
return YTArray(length, 'code_length', registry=registry)
length_valid_tuple = isinstance(length, (list, tuple)) and len(length) == 2
- unit_is_string = isinstance(length[1], str)
+ unit_is_string = isinstance(length[1], string_types)
if length_valid_tuple and unit_is_string:
return YTArray(*length, registry=registry)
else:
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/testing.py
--- a/yt/testing.py
+++ b/yt/testing.py
@@ -14,6 +14,7 @@
#-----------------------------------------------------------------------------
import hashlib
+from yt.extern.six import string_types
from yt.extern.six.moves import cPickle
import itertools as it
import numpy as np
@@ -329,7 +330,7 @@
# Determine the maximum number of values any of the keywords has
num_lists = 0
for val in keywords.values():
- if isinstance(val, str):
+ if isinstance(val, string_types):
num_lists = max(1.0, num_lists)
else:
num_lists = max(len(val), num_lists)
@@ -346,7 +347,7 @@
list_of_kwarg_dicts[i] = {}
for key in keywords.keys():
# if it's a string, use it (there's only one)
- if isinstance(keywords[key], str):
+ if isinstance(keywords[key], string_types):
list_of_kwarg_dicts[i][key] = keywords[key]
# if there are more options, use the i'th val
elif i < len(keywords[key]):
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/utilities/answer_testing/output_tests.py
--- a/yt/utilities/answer_testing/output_tests.py
+++ b/yt/utilities/answer_testing/output_tests.py
@@ -14,6 +14,7 @@
#-----------------------------------------------------------------------------
import matplotlib
+from yt.extern.six import string_types
from yt.mods import *
# We first create our dictionary of tests to run. This starts out empty, and
@@ -150,7 +151,7 @@
self.io_log = io_log
def __iter__(self):
- if isinstance(self.io_log, str):
+ if isinstance(self.io_log, string_types):
for line in open(self.io_log):
yield line[len(self.io_log_header):].split()[0].strip()
elif isinstance(self.io_log, list):
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/utilities/command_line.py
--- a/yt/utilities/command_line.py
+++ b/yt/utilities/command_line.py
@@ -20,7 +20,7 @@
from yt.startup_tasks import parser, subparsers
from yt.mods import *
from yt.funcs import *
-from yt.extern.six import add_metaclass
+from yt.extern.six import add_metaclass, string_types
from yt.extern.six.moves import urllib
from yt.utilities.minimal_representation import MinimalProjectDescription
import argparse, os, os.path, math, sys, time, subprocess, getpass, tempfile
@@ -40,7 +40,7 @@
return ds
def _add_arg(sc, arg):
- if isinstance(arg, str):
+ if isinstance(arg, string_types):
arg = _common_options[arg].copy()
argc = dict(arg.items())
argnames = []
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/utilities/operator_registry.py
--- a/yt/utilities/operator_registry.py
+++ b/yt/utilities/operator_registry.py
@@ -15,10 +15,11 @@
import copy
import types
+from yt.extern.six import string_types
class OperatorRegistry(dict):
def find(self, op, *args, **kwargs):
- if isinstance(op, str):
+ if isinstance(op, string_types):
# Lookup, assuming string or hashable object
op = copy.deepcopy(self[op])
op.args = args
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/utilities/periodic_table.py
--- a/yt/utilities/periodic_table.py
+++ b/yt/utilities/periodic_table.py
@@ -16,6 +16,7 @@
import numpy as np
import numbers
import types
+from yt.extern.six import string_types
_elements = (
(1, 1.0079400000, "Hydrogen", "H"),
@@ -164,7 +165,7 @@
def __getitem__(self, key):
if isinstance(key, (np.number, numbers.Number)):
d = self.elements_by_number
- elif isinstance(key, str):
+ elif isinstance(key, string_types):
if len(key) <= 2:
d = self.elements_by_symbol
elif len(key) == 3 and key[0] == "U":
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/visualization/color_maps.py
--- a/yt/visualization/color_maps.py
+++ b/yt/visualization/color_maps.py
@@ -16,6 +16,7 @@
import matplotlib.colors as cc
import matplotlib.cm as mcm
from . import _colormap_data as _cm
+from yt.extern.six import string_types
def is_colormap(cmap):
return isinstance(cmap,cc.Colormap)
@@ -365,7 +366,7 @@
# Figure out how many intervals there are total.
rolling_index = 0
for i, (color, interval) in enumerate(ctuple_list):
- if isinstance(color, str):
+ if isinstance(color, string_types):
ctuple_list[i] = (color_dict[color], interval)
rolling_index += interval
scale = 256./rolling_index
diff -r 6bb90c5fb64093ed15937d5cc1d9d82123112c07 -r 652f3058834c94de92fb59bfde799736182ee8b7 yt/visualization/volume_rendering/camera.py
--- a/yt/visualization/volume_rendering/camera.py
+++ b/yt/visualization/volume_rendering/camera.py
@@ -16,6 +16,7 @@
from yt.units.yt_array import YTArray
from yt.units.unit_registry import UnitParseError
from yt.utilities.math_utils import get_rotation_matrix
+from yt.extern.six import string_types
from .utils import data_source_or_all
from .lens import lenses
import numpy as np
@@ -231,7 +232,7 @@
(zma - zmi) ** 2)
focus = data_source.get_field_parameter('center')
- if iterable(width) and len(width) > 1 and isinstance(width[1], str):
+ if iterable(width) and len(width) > 1 and isinstance(width[1], string_types):
width = data_source.ds.quan(width[0], input_units=width[1])
# Now convert back to code length for subsequent manipulation
width = width.in_units("code_length") # .value
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list