Commit e858ed1
committed
Remove bpython._py3compat.prepare_for_exec
1 parent 07ec4e9 commit e858ed1
2 files changed
Lines changed: 5 additions & 22 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -37,18 +37,6 @@ | |||
| 37 | 37 | py3 = sys.version_info[0] == 3 | |
| 38 | 38 | ||
| 39 | 39 | ||
| 40 | - if py3 or sys.version_info[:3] >= (2, 7, 3): | ||
| 41 | - | ||
| 42 | - def prepare_for_exec(arg, encoding=None): | ||
| 43 | - return arg | ||
| 44 | - | ||
| 45 | - | ||
| 46 | - else: | ||
| 47 | - | ||
| 48 | - def prepare_for_exec(arg, encoding=None): | ||
| 49 | - return arg.encode(encoding) | ||
| 50 | - | ||
| 51 | - | ||
| 52 | 40 | if py3: | |
| 53 | 41 | ||
| 54 | 42 | def try_decode(s, encoding): | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -44,7 +44,7 @@ | |||
| 44 | 44 | ||
| 45 | 45 | from . import autocomplete | |
| 46 | 46 | from . import inspection | |
| 47 | - from ._py3compat import py3, prepare_for_exec | ||
| 47 | + from ._py3compat import py3 | ||
| 48 | 48 | from .clipboard import get_clipboard, CopyFailed | |
| 49 | 49 | from .config import getpreferredencoding | |
| 50 | 50 | from .formatter import Parenthesis | |
@@ -1169,14 +1169,12 @@ def send_to_external_editor(self, text): | |||
| 1169 | 1169 | exited with non-zero""" | |
| 1170 | 1170 | ||
| 1171 | 1171 | encoding = getpreferredencoding() | |
| 1172 | - editor_args = shlex.split( | ||
| 1173 | - prepare_for_exec(self.config.editor, encoding) | ||
| 1174 | - ) | ||
| 1172 | + editor_args = shlex.split(self.config.editor) | ||
| 1175 | 1173 | with tempfile.NamedTemporaryFile(suffix=".py") as temp: | |
| 1176 | 1174 | temp.write(text.encode(encoding)) | |
| 1177 | 1175 | temp.flush() | |
| 1178 | 1176 | ||
| 1179 | - args = editor_args + [prepare_for_exec(temp.name, encoding)] | ||
| 1177 | + args = editor_args + [temp.name] | ||
| 1180 | 1178 | if subprocess.call(args) == 0: | |
| 1181 | 1179 | with open(temp.name) as f: | |
| 1182 | 1180 | if py3: | |
@@ -1187,11 +1185,8 @@ def send_to_external_editor(self, text): | |||
| 1187 | 1185 | return text | |
| 1188 | 1186 | ||
| 1189 | 1187 | def open_in_external_editor(self, filename): | |
| 1190 | - encoding = getpreferredencoding() | ||
| 1191 | - editor_args = shlex.split( | ||
| 1192 | - prepare_for_exec(self.config.editor, encoding) | ||
| 1193 | - ) | ||
| 1194 | - args = editor_args + [prepare_for_exec(filename, encoding)] | ||
| 1188 | + editor_args = shlex.split(self.config.editor) | ||
| 1189 | + args = editor_args + [filename] | ||
| 1195 | 1190 | return subprocess.call(args) == 0 | |
| 1196 | 1191 | ||
| 1197 | 1192 | def edit_config(self): | |
0 commit comments