[3.6] bpo-30166: backport pyshell changes (GH 1293) (#2098) · python/cpython@c0ef607 (original) (raw)

`@@ -18,12 +18,10 @@

`

18

18

`raise SystemExit(1)

`

19

19

``

20

20

`from code import InteractiveInterpreter

`

21

``

`-

import getopt

`

22

``

`-

import io

`

23

21

`import linecache

`

24

22

`import os

`

25

23

`import os.path

`

26

``

`-

from platform import python_version, system

`

``

24

`+

from platform import python_version

`

27

25

`import re

`

28

26

`import socket

`

29

27

`import subprocess

`

`@@ -32,14 +30,12 @@

`

32

30

`import tokenize

`

33

31

`import warnings

`

34

32

``

35

``

`-

from idlelib import testing # bool value

`

36

33

`from idlelib.colorizer import ColorDelegator

`

37

34

`from idlelib.config import idleConf

`

38

35

`from idlelib import debugger

`

39

36

`from idlelib import debugger_r

`

40

37

`from idlelib.editor import EditorWindow, fixwordbreaks

`

41

38

`from idlelib.filelist import FileList

`

42

``

`-

from idlelib import macosx

`

43

39

`from idlelib.outwin import OutputWindow

`

44

40

`from idlelib import rpc

`

45

41

`from idlelib.run import idle_formatwarning, PseudoInputFile, PseudoOutputFile

`

`@@ -1372,6 +1368,11 @@ def fix_x11_paste(root):

`

1372

1368

`"""

`

1373

1369

``

1374

1370

`def main():

`

``

1371

`+

import getopt

`

``

1372

`+

from platform import system

`

``

1373

`+

from idlelib import testing # bool value

`

``

1374

`+

from idlelib import macosx

`

``

1375

+

1375

1376

`global flist, root, use_subprocess

`

1376

1377

``

1377

1378

`capture_warnings(True)

`