Skip to content

Commit d15df54

Browse files
Jorge Fernandez HernandezJorge Fernandez Hernandez
authored andcommitted
Include char and unicode arrays
1 parent bafd64e commit d15df54

1 file changed

Lines changed: 0 additions & 47 deletions

File tree

astropy/io/votable/converters.py

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -429,30 +429,6 @@ def parse(self, value, config=None, pos=None):
429429

430430
return _make_masked_array(result, result_mask), False
431431

432-
def parse_parts(self, parts, config=None, pos=None):
433-
result = []
434-
result_mask = []
435-
for part in parts:
436-
v, m = self.char_parse(part, config, pos)
437-
result.append(v)
438-
result_mask.append(m)
439-
440-
result = np.array(result, dtype=self._char_format)
441-
result_mask = np.array(result_mask, dtype="bool")
442-
443-
return result, result_mask
444-
445-
def char_parse(self, value, config=None, pos=None):
446-
if len(value) > self._string_length:
447-
vo_warn(W46, ("char", self._string_length), config, pos)
448-
449-
# Warn about non-ascii characters if warnings are enabled.
450-
try:
451-
value.encode("ascii")
452-
except UnicodeEncodeError:
453-
vo_warn(W55, (self.field_name, value), config, pos)
454-
return value, False
455-
456432
def binparse(self, read):
457433
items = self._parse_length(read)
458434

@@ -783,29 +759,6 @@ def parse(self, value, config=None, pos=None):
783759

784760
return _make_masked_array(result, result_mask), False
785761

786-
def parse_parts(self, parts, config=None, pos=None):
787-
result = []
788-
result_mask = []
789-
for part in parts:
790-
v, m = self.char_parse(part, config, pos)
791-
result.append(v)
792-
result_mask.append(m)
793-
794-
result = np.array(result, dtype=self._char_format)
795-
result_mask = np.array(result_mask, dtype="bool")
796-
797-
return result, result_mask
798-
799-
def char_parse(self, value, config=None, pos=None):
800-
if len(value) > self._string_length:
801-
vo_warn(W46, ("unicodeChar", self._string_length), config, pos)
802-
803-
try:
804-
value.encode("utf-16-be")
805-
except UnicodeEncodeError:
806-
vo_warn(W55, (self.field_name, value), config, pos)
807-
return value, False
808-
809762
def binparse(self, read):
810763
items = self._parse_length(read)
811764

0 commit comments

Comments
 (0)