[yt-svn] commit/yt: ngoldbaum: Merged in atmyers/yt (pull request #1911)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/2e566775b859/
Changeset:   2e566775b859
Branch:      yt
User:        ngoldbaum
Date:        2015-12-17 23:13:28+00:00
Summary:     Merged in atmyers/yt (pull request #1911)

[Bugfix] Fixing a bug in the Exodus II frontend
Affected #:  2 files

diff -r 97d5e68dd39a2a008c8c621f94d253bfa8fb0b5d -r 2e566775b859ec8bc1778ada8e8a92ad2b380046 yt/frontends/exodus_ii/tests/test_outputs.py
--- a/yt/frontends/exodus_ii/tests/test_outputs.py
+++ b/yt/frontends/exodus_ii/tests/test_outputs.py
@@ -26,11 +26,20 @@
 @requires_file(out)
 def test_out():
     ds = data_dir_load(out)
+    field_list = [('connect1', 'conv_indicator'),
+                  ('connect1', 'conv_marker'),
+                  ('connect1', 'convected'),
+                  ('connect1', 'diffused'),
+                  ('connect2', 'conv_indicator'),
+                  ('connect2', 'conv_marker'),
+                  ('connect2', 'convected'),
+                  ('connect2', 'diffused')]
     yield assert_equal, str(ds), "out.e"
     yield assert_equal, ds.dimensionality, 3
     yield assert_equal, ds.current_time, 0.0
     yield assert_array_equal, ds.parameters['nod_names'], ['convected', 'diffused']
     yield assert_equal, ds.parameters['num_meshes'], 2
+    yield assert_array_equal, ds.field_list, field_list 
 
 out_s002 = "ExodusII/out.e-s002"
 
@@ -38,9 +47,18 @@
 @requires_file(out_s002)
 def test_out002():
     ds = data_dir_load(out_s002)
+    field_list = [('connect1', 'conv_indicator'),
+                  ('connect1', 'conv_marker'),
+                  ('connect1', 'convected'),
+                  ('connect1', 'diffused'),
+                  ('connect2', 'conv_indicator'),
+                  ('connect2', 'conv_marker'),
+                  ('connect2', 'convected'),
+                  ('connect2', 'diffused')]
     yield assert_equal, str(ds), "out.e-s002"
     yield assert_equal, ds.dimensionality, 3
     yield assert_equal, ds.current_time, 2.0
+    yield assert_array_equal, ds.field_list, field_list 
 
 gold = "ExodusII/gold.e"
 
@@ -48,4 +66,6 @@
 @requires_file(gold)
 def test_gold():
     ds = data_dir_load(gold)
+    field_list = [('connect1', 'forced')]
     yield assert_equal, str(ds), "gold.e"
+    yield assert_array_equal, ds.field_list, field_list 

diff -r 97d5e68dd39a2a008c8c621f94d253bfa8fb0b5d -r 2e566775b859ec8bc1778ada8e8a92ad2b380046 yt/frontends/exodus_ii/util.py
--- a/yt/frontends/exodus_ii/util.py
+++ b/yt/frontends/exodus_ii/util.py
@@ -1,12 +1,15 @@
 import sys
+import string
 from itertools import takewhile
 from collections import OrderedDict
 import re
 
+_printable = set([ord(_) for _ in string.printable])
+
 def sanitize_string(s):
     if sys.version_info > (3, ):
-        return "".join([chr(_) for _ in takewhile(lambda a: a, s)])
-    return "".join([_ for _ in takewhile(lambda a: a, s)])
+        return "".join([chr(_) for _ in takewhile(lambda a: a in _printable, s)])
+    return "".join([_ for _ in takewhile(lambda a: a in string.printable, s)])
 
 def load_info_records(info_records):
     info_records_parsed = [sanitize_string(line_chars) for line_chars in info_records]

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.