diff -urN v8/ezhtml.py v9/ezhtml.py
--- v8/ezhtml.py 2018-09-18 21:52:28.000000000 +0900
+++ v9/ezhtml.py 2018-09-18 22:19:51.000000000 +0900
@@ -28,13 +28,16 @@
s += '' + lst[0] + '>'
return s
+def get_tag_v(d):
+ return list( d.items() )[0]
+
def html_dump(o):
if not o:
return ''
if type(o) == list:
return '\n'.join( map(html_dump, o) )
if type(o) == dict:
- (tag, v) = list( o.items() )[0]
+ (tag, v) = get_tag_v(o)
return dump_tag(tag, v)
return cv_amp(o)
@@ -83,7 +86,7 @@
lst = ['li']
if type(e) != dict:
return False
- (tag, v) = e.items()[0]
+ (tag, v) = get_tag_v(e)
return v == '/' and tag.split(' ')[0] in lst
def solo_tag_has_v_idx(lst):
@@ -107,7 +110,7 @@
r += p
if lst:
(e, lst) = ( lst[0], lst[1:] )
- (tag, v) = e.items()[0] # v == '/'
+ (tag, v) = get_tag_v(e) # v == '/'
(p, lst) = div_lst(lst)
r += [ { tag + ' /': strip_lst1(p) } ]
return r
diff -urN v8/nkf.py v9/nkf.py
--- v8/nkf.py 2018-09-17 00:15:20.000000000 +0900
+++ v9/nkf.py 2018-09-18 22:20:22.000000000 +0900
@@ -12,11 +12,7 @@
def do_cmd(cmd, in_b):
cmd = enc(cmd)
proc = subprocess.Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE)
- proc.stdin.write(in_b)
- proc.stdin.close()
- r = proc.stdout.read()
- proc.wait()
- return r # out_b
+ return proc.communicate(in_b)[0]
def get_stdin():
fi = sys.stdin if six.PY2 else sys.stdin.buffer