Set up sys.path properly. Also don't read PYTHONSTARTUP when executed… · bpython/bpython@b674ff5 · GitHub

bpython / bpython Public

• Notifications You must be signed in to change notification settings
• Fork 252
• Star 2.8k

• Code
• Issues 144
• Pull requests 5
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit b674ff5

Browse filesBrowse the repository at this point in the historyBrowse files

Trundle

committed

Set up sys.path properly. Also don't read PYTHONSTARTUP when executed with -i.

The latter to be consistent with Python. This closes issue #88.

1 parent b70c809 commit b674ff5
Copy full SHA for b674ff5

5 files changed

+9-4Lines changed: 9 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• bpython
  • args.py
  • cli.py
  • gtk_.py
  • repl.py
• doc
  • bpython.1

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎bpython/args.py‎

Copy file name to clipboardExpand all lines: bpython/args.py

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -101,5 +101,6 @@ def exec_code(interpreter, args):
101	101	with open(args[0], 'r') as sourcefile:
102	102	code_obj = compile(sourcefile.read(), args[0], 'exec')
103	103	old_argv, sys.argv = sys.argv, args
	104	+ sys.path.insert(0, os.path.abspath(os.path.dirname(args[0])))
104	105	interpreter.runcode(code_obj)
105	106	sys.argv = old_argv

Collapse file

‎bpython/cli.py‎

Copy file name to clipboardExpand all lines: bpython/cli.py

+3-2Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -1548,13 +1548,14 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
1548	1548	sys.stdout = repl
1549	1549	sys.stderr = repl
1550	1550
1551		- repl.startup()
1552		-
1553	1551	if args:
1554	1552	bpython.args.exec_code(interpreter, args)
1555	1553	if not interactive:
1556	1554	curses.raw(False)
1557	1555	return repl.getstdout()
	1556	+ else:
	1557	+ sys.path.insert(0, '')
	1558	+ repl.startup()
1558	1559
1559	1560	if banner is not None:
1560	1561	repl.write(banner)

Collapse file

‎bpython/gtk_.py‎

Copy file name to clipboardExpand all lines: bpython/gtk_.py

+4-1Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -637,7 +637,10 @@ def main(args=None):
637	637	sys.stdout = repl_widget
638	638
639	639	gobject.idle_add(init_import_completion)
640		- gobject.idle_add(repl_widget.startup)
	640	+
	641	+ if not args:
	642	+ sys.path.insert(0, '')
	643	+ gobject.idle_add(repl_widget.startup)
641	644
642	645	if not options.socket_id:
643	646	parent = gtk.Window()

Collapse file

‎bpython/repl.py‎

Copy file name to clipboardExpand all lines: bpython/repl.py

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -296,7 +296,6 @@ def __init__(self, interp, config, idle=None):
296	296	self.list_win_visible = False
297	297	self._C = {}
298	298	self.prev_block_finished = 0
299		- sys.path.insert(0, '.')
300	299
301	300	pythonhist = os.path.expanduser(self.config.hist_file)
302	301	if os.path.exists(pythonhist):

Collapse file

‎doc/bpython.1‎

Copy file name to clipboardExpand all lines: doc/bpython.1

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -70,6 +70,7 @@ Show the help message and exit.
70	70	.IP "\fB\-\-interactive\fR" 4
71	71	.PD
72	72	Drop to bpython shell after running \fIfile\fR instead of exiting.
	73	+ The PYTHONSTARTUP file is not read.
73	74	.IP "\fB\-q\fR" 4
74	75	.PD 0
75	76	.IP "\fB\-\-quiet\fR" 4

0 commit comments

Comments

0 (0)