Disable interspersed arguments to allow -m to work sanely.

James William Pye · James William Pye · commit d96bdb379fff · 2009-03-07T16:13:10.000-07:00
It was originally enabled to allow #!x scripts to accept client parameters.
diff --git a/postgresql/bin/pg_python.py b/postgresql/bin/pg_python.py
@@ -38,13 +38,12 @@ def extract_parameters(src):
 	]
 
 def command(args = sys.argv):
-	# Allow connection options to be collected in #!pg_python lines
 	p = clientparameters.DefaultParser(
 		"%prog [connection options] [script] [-- script options] [args]",
 		version = '1.0',
 		option_list = default_options
 	)
-	p.enable_interspersed_args()
+	p.disable_interspersed_args()
 	co, ca = p.parse_args(args[1:])
 	in_xact = co.in_xact
 

Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,12 @@ def extract_parameters(src):`
`38`	`38`	`]`
`39`	`39`
`40`	`40`	`def command(args = sys.argv):`
`41`		`- # Allow connection options to be collected in #!pg_python lines`
`42`	`41`	`p = clientparameters.DefaultParser(`
`43`	`42`	`"%prog [connection options] [script] [-- script options] [args]",`
`44`	`43`	`version = '1.0',`
`45`	`44`	`option_list = default_options`
`46`	`45`	`)`
`47`		`- p.enable_interspersed_args()`
	`46`	`+ p.disable_interspersed_args()`
`48`	`47`	`co, ca = p.parse_args(args[1:])`
`49`	`48`	`in_xact = co.in_xact`
`50`	`49`