Skip to content

Commit c12b6b3

Browse files
robert-hhrobert-hh
committed
Did not like everything of the last change
1 parent caa0434 commit c12b6b3

File tree

7 files changed

+123
-147
lines changed

7 files changed

+123
-147
lines changed

‎pe.py‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ def __init__(self, tab_size, undo_limit):
4848
self.top_line = self.cur_line = self.row = self.col = self.margin = 0
4949
self.tab_size = tab_size
5050
self.changed = " "
51-
self.message = self.find_pattern = ""
52-
self.fname = None
51+
self.message = self.find_pattern = self.fname = ""
5352
self.content = [""]
5453
self.undo = []
5554
self.undo_limit = max(undo_limit, 0)
@@ -516,17 +515,16 @@ def handle_edit_keys(self, key):
516515
if True:
517516
if self.mark != None:
518517
fname = self.line_edit("Save Mark: ", "")
519-
lrange = self.line_range()
520-
self.put_file(fname, lrange[0], lrange[1])
518+
if fname:
519+
lrange = self.line_range()
520+
self.put_file(fname, lrange[0], lrange[1])
521521
else:
522-
fname = self.fname
523-
if fname == None:
524-
fname = ""
525-
fname = self.line_edit("Save File: ", fname)
526-
self.put_file(fname, 0, self.total_lines)
527-
self.changed = ' '
528-
self.undo_zero = len(self.undo)
529-
self.fname = fname
522+
fname = self.line_edit("Save File: ", self.fname)
523+
if fname:
524+
self.put_file(fname, 0, self.total_lines)
525+
self.changed = ' '
526+
self.undo_zero = len(self.undo)
527+
self.fname = fname
530528
elif key == 0x1a:
531529
if len(self.undo) > 0:
532530
action = self.undo.pop(-1)
@@ -600,16 +598,15 @@ def get_file(self, fname):
600598
return (content, "")
601599
def put_file(self, fname, start, stop):
602600
from os import rename, unlink
603-
if fname:
604-
with open("tmpfile.pye", "w") as f:
605-
for l in self.content[start:stop]:
606-
if self.write_tabs == 'y':
607-
f.write(self.packtabs(l) + '\n')
608-
else:
609-
f.write(l + '\n')
610-
try: unlink(fname)
611-
except: pass
612-
rename("tmpfile.pye", fname)
601+
with open("tmpfile.pye", "w") as f:
602+
for l in self.content[start:stop]:
603+
if self.write_tabs == 'y':
604+
f.write(self.packtabs(l) + '\n')
605+
else:
606+
f.write(l + '\n')
607+
try: unlink(fname)
608+
except: pass
609+
rename("tmpfile.pye", fname)
613610
def expandtabs(s):
614611
from _io import StringIO
615612
if '\t' in s:
@@ -639,4 +636,4 @@ def pye(content = None, tab_size = 4, undo = 50, device = 0, baud = 115200):
639636
e.init_tty(device, baud)
640637
e.edit_loop()
641638
e.deinit_tty()
642-
return e.content if (e.fname == None) else e.fname
639+
return e.content if (e.fname == "") else e.fname

‎pe2.py‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ def __init__(self, tab_size, undo_limit):
4848
self.top_line = self.cur_line = self.row = self.col = self.margin = 0
4949
self.tab_size = tab_size
5050
self.changed = " "
51-
self.message = self.find_pattern = ""
52-
self.fname = None
51+
self.message = self.find_pattern = self.fname = ""
5352
self.content = [""]
5453
self.undo = []
5554
self.undo_limit = max(undo_limit, 0)
@@ -525,17 +524,16 @@ def handle_edit_keys(self, key):
525524
if True:
526525
if self.mark != None:
527526
fname = self.line_edit("Save Mark: ", "")
528-
lrange = self.line_range()
529-
self.put_file(fname, lrange[0], lrange[1])
527+
if fname:
528+
lrange = self.line_range()
529+
self.put_file(fname, lrange[0], lrange[1])
530530
else:
531-
fname = self.fname
532-
if fname == None:
533-
fname = ""
534-
fname = self.line_edit("Save File: ", fname)
535-
self.put_file(fname, 0, self.total_lines)
536-
self.changed = ' '
537-
self.undo_zero = len(self.undo)
538-
self.fname = fname
531+
fname = self.line_edit("Save File: ", self.fname)
532+
if fname:
533+
self.put_file(fname, 0, self.total_lines)
534+
self.changed = ' '
535+
self.undo_zero = len(self.undo)
536+
self.fname = fname
539537
elif key == 0x1a:
540538
if len(self.undo) > 0:
541539
action = self.undo.pop(-1)
@@ -609,16 +607,15 @@ def get_file(self, fname):
609607
return (content, "")
610608
def put_file(self, fname, start, stop):
611609
from os import rename, unlink
612-
if fname:
613-
with open("tmpfile.pye", "w") as f:
614-
for l in self.content[start:stop]:
615-
if self.write_tabs == 'y':
616-
f.write(self.packtabs(l) + '\n')
617-
else:
618-
f.write(l + '\n')
619-
try: unlink(fname)
620-
except: pass
621-
rename("tmpfile.pye", fname)
610+
with open("tmpfile.pye", "w") as f:
611+
for l in self.content[start:stop]:
612+
if self.write_tabs == 'y':
613+
f.write(self.packtabs(l) + '\n')
614+
else:
615+
f.write(l + '\n')
616+
try: unlink(fname)
617+
except: pass
618+
rename("tmpfile.pye", fname)
622619
def expandtabs(s):
623620
from _io import StringIO
624621
if '\t' in s:
@@ -649,4 +646,4 @@ def pye(content = None, tab_size = 4, undo = 50, device = 0, baud = 115200):
649646
e.init_tty(device, baud)
650647
e.edit_loop()
651648
e.deinit_tty()
652-
return e.content if (e.fname == None) else e.fname
649+
return e.content if (e.fname == "") else e.fname

‎pemin.py‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ def __init__(self, tab_size, undo_limit):
2424
self.top_line = self.cur_line = self.row = self.col = self.margin = 0
2525
self.tab_size = tab_size
2626
self.changed = " "
27-
self.message = self.find_pattern = ""
28-
self.fname = None
27+
self.message = self.find_pattern = self.fname = ""
2928
self.content = [""]
3029
self.undo = []
3130
self.undo_limit = max(undo_limit, 0)
@@ -361,14 +360,12 @@ def handle_edit_keys(self, key):
361360
self.total_lines += len(self.yank_buffer)
362361
elif key == 0x13:
363362
if True:
364-
fname = self.fname
365-
if fname == None:
366-
fname = ""
367-
fname = self.line_edit("Save File: ", fname)
368-
self.put_file(fname, 0, self.total_lines)
369-
self.changed = ' '
370-
self.undo_zero = len(self.undo)
371-
self.fname = fname
363+
fname = self.line_edit("Save File: ", self.fname)
364+
if fname:
365+
self.put_file(fname, 0, self.total_lines)
366+
self.changed = ' '
367+
self.undo_zero = len(self.undo)
368+
self.fname = fname
372369
elif key == 0x1a:
373370
if len(self.undo) > 0:
374371
action = self.undo.pop(-1)
@@ -427,13 +424,12 @@ def get_file(self, fname):
427424
return (content, "")
428425
def put_file(self, fname, start, stop):
429426
from os import rename, unlink
430-
if fname:
431-
with open("tmpfile.pye", "w") as f:
432-
for l in self.content[start:stop]:
433-
f.write(l + '\n')
434-
try: unlink(fname)
435-
except: pass
436-
rename("tmpfile.pye", fname)
427+
with open("tmpfile.pye", "w") as f:
428+
for l in self.content[start:stop]:
429+
f.write(l + '\n')
430+
try: unlink(fname)
431+
except: pass
432+
rename("tmpfile.pye", fname)
437433
def expandtabs(s):
438434
from _io import StringIO
439435
if '\t' in s:
@@ -463,4 +459,4 @@ def pye(content = None, tab_size = 4, undo = 50, device = 0, baud = 115200):
463459
e.init_tty(device, baud)
464460
e.edit_loop()
465461
e.deinit_tty()
466-
return e.content if (e.fname == None) else e.fname
462+
return e.content if (e.fname == "") else e.fname

‎pye.py‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,7 @@ def __init__(self, tab_size, undo_limit):
156156
self.top_line = self.cur_line = self.row = self.col = self.margin = 0
157157
self.tab_size = tab_size
158158
self.changed = " "
159-
self.message = self.find_pattern = ""
160-
self.fname = None
159+
self.message = self.find_pattern = self.fname = ""
161160
self.content = [""]
162161
self.undo = []
163162
self.undo_limit = max(undo_limit, 0)
@@ -591,7 +590,7 @@ def undo_add(self, lnum, text, key, span = 1):
591590
self.changed = '*'
592591
if self.undo_limit > 0 and (
593592
len(self.undo) == 0 or key == 0 or self.undo[-1][3] != key or self.undo[-1][0] != lnum):
594-
if len(self.undo) >= self.undo_limit: ## drop oldest undo
593+
if len(self.undo) >= self.undo_limit: ## drop oldest undo, if full
595594
del self.undo[0]
596595
self.undo_zero -= 1
597596
self.undo.append((lnum, span, text, key, self.col))
@@ -749,18 +748,17 @@ def handle_edit_keys(self, key): ## keys which change content
749748
#ifndef BASIC
750749
if self.mark != None:
751750
fname = self.line_edit("Save Mark: ", "")
752-
lrange = self.line_range()
753-
self.put_file(fname, lrange[0], lrange[1])
751+
if fname:
752+
lrange = self.line_range()
753+
self.put_file(fname, lrange[0], lrange[1])
754754
else:
755755
#endif
756-
fname = self.fname
757-
if fname == None:
758-
fname = ""
759-
fname = self.line_edit("Save File: ", fname)
760-
self.put_file(fname, 0, self.total_lines)
761-
self.changed = ' ' ## clear change flag
762-
self.undo_zero = len(self.undo) ## remember state
763-
self.fname = fname ## remember (new) name
756+
fname = self.line_edit("Save File: ", self.fname)
757+
if fname:
758+
self.put_file(fname, 0, self.total_lines)
759+
self.changed = ' ' ## clear change flag
760+
self.undo_zero = len(self.undo) ## remember state
761+
self.fname = fname ## remember (new) name
764762
elif key == KEY_UNDO:
765763
if len(self.undo) > 0:
766764
action = self.undo.pop(-1) ## get action from stack
@@ -865,18 +863,17 @@ def get_file(self, fname):
865863
## write file
866864
def put_file(self, fname, start, stop):
867865
from os import rename, unlink
868-
if fname:
869-
with open("tmpfile.pye", "w") as f:
870-
for l in self.content[start:stop]:
866+
with open("tmpfile.pye", "w") as f:
867+
for l in self.content[start:stop]:
871868
#ifndef BASIC
872-
if self.write_tabs == 'y':
873-
f.write(self.packtabs(l) + '\n')
874-
else:
869+
if self.write_tabs == 'y':
870+
f.write(self.packtabs(l) + '\n')
871+
else:
875872
#endif
876-
f.write(l + '\n')
877-
try: unlink(fname)
878-
except: pass
879-
rename("tmpfile.pye", fname)
873+
f.write(l + '\n')
874+
try: unlink(fname)
875+
except: pass
876+
rename("tmpfile.pye", fname)
880877

881878
## expandtabs: hopefully sometimes replaced by the built-in function
882879
def expandtabs(s):
@@ -916,7 +913,7 @@ def pye(content = None, tab_size = 4, undo = 50, device = 0, baud = 115200):
916913
e.deinit_tty()
917914
#endif
918915
## close
919-
return e.content if (e.fname == None) else e.fname
916+
return e.content if (e.fname == "") else e.fname
920917

921918
#ifdef LINUX
922919
if __name__ == "__main__":

‎pye2.py‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,7 @@ def __init__(self, tab_size, undo_limit):
157157
self.top_line = self.cur_line = self.row = self.col = self.margin = 0
158158
self.tab_size = tab_size
159159
self.changed = " "
160-
self.message = self.find_pattern = ""
161-
self.fname = None
160+
self.message = self.find_pattern = self.fname = ""
162161
self.content = [""]
163162
self.undo = []
164163
self.undo_limit = max(undo_limit, 0)
@@ -758,18 +757,17 @@ def handle_edit_keys(self, key): ## keys which change content
758757
#ifndef BASIC
759758
if self.mark != None:
760759
fname = self.line_edit("Save Mark: ", "")
761-
lrange = self.line_range()
762-
self.put_file(fname, lrange[0], lrange[1])
760+
if fname:
761+
lrange = self.line_range()
762+
self.put_file(fname, lrange[0], lrange[1])
763763
else:
764764
#endif
765-
fname = self.fname
766-
if fname == None:
767-
fname = ""
768-
fname = self.line_edit("Save File: ", fname)
769-
self.put_file(fname, 0, self.total_lines)
770-
self.changed = ' ' ## clear change flag
771-
self.undo_zero = len(self.undo) ## remember state
772-
self.fname = fname ## remember (new) name
765+
fname = self.line_edit("Save File: ", self.fname)
766+
if fname:
767+
self.put_file(fname, 0, self.total_lines)
768+
self.changed = ' ' ## clear change flag
769+
self.undo_zero = len(self.undo) ## remember state
770+
self.fname = fname ## remember (new) name
773771
elif key == KEY_UNDO:
774772
if len(self.undo) > 0:
775773
action = self.undo.pop(-1) ## get action from stack
@@ -872,18 +870,17 @@ def get_file(self, fname):
872870
## write file
873871
def put_file(self, fname, start, stop):
874872
from os import rename, unlink
875-
if fname:
876-
with open("tmpfile.pye", "w") as f:
877-
for l in self.content[start:stop]:
873+
with open("tmpfile.pye", "w") as f:
874+
for l in self.content[start:stop]:
878875
#ifndef BASIC
879-
if self.write_tabs == 'y':
880-
f.write(self.packtabs(l) + '\n')
881-
else:
876+
if self.write_tabs == 'y':
877+
f.write(self.packtabs(l) + '\n')
878+
else:
882879
#endif
883-
f.write(l + '\n')
884-
try: unlink(fname)
885-
except: pass
886-
rename("tmpfile.pye", fname)
880+
f.write(l + '\n')
881+
try: unlink(fname)
882+
except: pass
883+
rename("tmpfile.pye", fname)
887884
## expandtabs: hopefully sometimes replaced by the built-in function
888885
def expandtabs(s):
889886
from _io import StringIO
@@ -923,7 +920,7 @@ def pye(content = None, tab_size = 4, undo = 50, device = 0, baud = 115200):
923920
e.deinit_tty()
924921
#endif
925922
## close
926-
return e.content if (e.fname == None) else e.fname
923+
return e.content if (e.fname == "") else e.fname
927924

928925
#ifdef LINUX
929926
if __name__ == "__main__":

0 commit comments

Comments
 (0)