mirror of https://github.com/cheat/cheat.git
Addressing issue #372
Previous pull-requests #406 and #413 attempted to resolve #372. They were, however, never merged in. Given that #391 was just merged (which rewrites a significant amount of prior code), I here took what we learned from #406 and #413 and re-implemented it. This approach will be less error-prone than attempting to rebase either of the former on the changes introduced in #391.
This commit is contained in:
parent
87448c49fa
commit
13c0ea7525
|
@ -1,3 +1,4 @@
|
||||||
|
import io
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
|
|
||||||
|
@ -74,5 +75,5 @@ class Sheet:
|
||||||
if not self.exists(sheet):
|
if not self.exists(sheet):
|
||||||
Utils.die('No cheatsheet found for ' + sheet)
|
Utils.die('No cheatsheet found for ' + sheet)
|
||||||
|
|
||||||
with open(self.path(sheet)) as cheatfile:
|
with io.open(self.path(sheet), encoding='utf-8') as cheatfile:
|
||||||
return cheatfile.read()
|
return cheatfile.read()
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import io
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from cheat.utils import Utils
|
from cheat.utils import Utils
|
||||||
|
@ -92,7 +93,7 @@ class Sheets:
|
||||||
|
|
||||||
for cheatsheet in sorted(self.get().items()):
|
for cheatsheet in sorted(self.get().items()):
|
||||||
match = ''
|
match = ''
|
||||||
for line in open(cheatsheet[1]):
|
for line in io.open(cheatsheet[1], encoding='utf-8'):
|
||||||
if term in line:
|
if term in line:
|
||||||
match += ' ' + self._utils.highlight(term, line)
|
match += ' ' + self._utils.highlight(term, line)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue