Skip to content

bpo-30166: Import command-line parsing modules only when needed. #1293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 4 commits into from
May 4, 2017
Merged

bpo-30166: Import command-line parsing modules only when needed. #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
014fc5a
bpo-30166: Import command-line parsing modules only when needed.
serhiy-storchaka Apr 26, 2017
a9f649f
Always add an empty line after imports.
serhiy-storchaka Apr 26, 2017
7973dde
Move 'import idlelib' into main() too.
serhiy-storchaka Apr 27, 2017
b897bfd
Update outdated comment in profile.py.
serhiy-storchaka Apr 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Lib/code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import sys
import traceback
import argparse
from codeop import CommandCompiler, compile_command

__all__ = ["InteractiveInterpreter", "InteractiveConsole", "interact",
Expand Down Expand Up @@ -303,6 +302,8 @@ def interact(banner=None, readfunc=None, local=None, exitmsg=None):


if __name__ == "__main__":
import argparse

@berkerpeksag berkerpeksag Apr 26, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style nit: You may want to add a new line after import argparse like the other cases.

@serhiy-storchaka serhiy-storchaka Apr 26, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a thing that compelled me to hesitate. Some usages of argparse have an empty line after imports, some doesn't have (and the majority doesn't have). I added a new line if the following code is large or separated on sections by empty lines, and didn't add it if the following code is short and dense, as in this case.


parser = argparse.ArgumentParser()
parser.add_argument('-q', action='store_true',
help="don't print version and copyright messages")
Expand Down
3 changes: 2 additions & 1 deletion Lib/doctest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ def _test():
]

import __future__
import argparse
import difflib
import inspect
import linecache
Expand Down Expand Up @@ -2741,6 +2740,8 @@ def get(self):


def _test():
import argparse

parser = argparse.ArgumentParser(description="doctest runner")
parser.add_argument('-v', '--verbose', action='store_true', default=False,
help='print very verbose output for all tests')
Expand Down
3 changes: 2 additions & 1 deletion Lib/http/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
"SimpleHTTPRequestHandler", "CGIHTTPRequestHandler",
]

import argparse
import copy
import datetime
import email.utils
Expand Down Expand Up @@ -1227,6 +1226,8 @@ def test(HandlerClass=BaseHTTPRequestHandler,
sys.exit(0)

if __name__ == '__main__':
import argparse

parser = argparse.ArgumentParser()
parser.add_argument('--cgi', action='store_true',
help='Run as CGI Server')
Expand Down
10 changes: 6 additions & 4 deletions Lib/idlelib/pyshell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@
raise SystemExit(1)

from code import InteractiveInterpreter
import getopt
import linecache
import os
import os.path
from platform import python_version, system
from platform import python_version
import re
import socket
import subprocess
Expand All @@ -31,14 +30,12 @@
import tokenize
import warnings

from idlelib import testing # bool value
from idlelib.colorizer import ColorDelegator
from idlelib.config import idleConf
from idlelib import debugger
from idlelib import debugger_r
from idlelib.editor import EditorWindow, fixwordbreaks
from idlelib.filelist import FileList
from idlelib import macosx
from idlelib.outwin import OutputWindow
from idlelib import rpc
from idlelib.run import idle_formatwarning, PseudoInputFile, PseudoOutputFile
Expand Down Expand Up @@ -1371,6 +1368,11 @@ def fix_x11_paste(root):
"""

def main():
import getopt
from platform import system
from idlelib import testing # bool value
from idlelib import macosx

global flist, root, use_subprocess

capture_warnings(True)
Expand Down
7 changes: 4 additions & 3 deletions Lib/profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@


import sys
import os

@terryjreedy terryjreedy Apr 27, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

def trace_dispatch (line 184 in 3.6.1) is preceded by an apparently out-of-date comment
# Heavily optimized dispatch routine for os.times() timer
That os.times is no longer used is why the os import can be moved.
self.timer is now time.process time

import time
import marshal
from optparse import OptionParser

__all__ = ["run", "runctx", "Profile"]

Expand Down Expand Up @@ -179,7 +177,7 @@ def get_time_timer(timer=timer, sum=sum):
self.t = self.get_time()
self.simulate_call('profiler')

# Heavily optimized dispatch routine for os.times() timer
# Heavily optimized dispatch routine for time.process_time() timer

def trace_dispatch(self, frame, event, arg):
timer = self.timer
Expand Down Expand Up @@ -552,6 +550,9 @@ def f(m, f1=f1):
#****************************************************************************

def main():
import os
from optparse import OptionParser

usage = "profile.py [-o output_file_path] [-s sort] scriptfile [arg] ..."
parser = OptionParser(usage=usage)
parser.allow_interspersed_args = False
Expand Down
3 changes: 2 additions & 1 deletion Lib/tabnanny.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

import os
import sys
import getopt
import tokenize
if not hasattr(tokenize, 'NL'):
raise ValueError("tokenize.NL doesn't exist -- tokenize module too old")
Expand All @@ -40,6 +39,8 @@ def errprint(*args):
sys.stderr.write("\n")

def main():
import getopt

global verbose, filename_only
try:
opts, args = getopt.getopt(sys.argv[1:], "qv")
Expand Down
3 changes: 2 additions & 1 deletion Lib/trace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
r.write_results(show_missing=True, coverdir="/tmp")
"""
__all__ = ['Trace', 'CoverageResults']
import argparse

import linecache
import os
import re
Expand Down Expand Up @@ -609,6 +609,7 @@ def results(self):
callers=self._callers)

def main():
import argparse

parser = argparse.ArgumentParser()
parser.add_argument('--version', action='version', version='trace 2.0')
Expand Down