Correct \e execution and use postgresql.__version__ for the console scripts.

James William Pye · James William Pye · commit 31359db87f09 · 2009-03-17T15:15:29.000-07:00
diff --git a/postgresql/bin/pg_dotconf.py b/postgresql/bin/pg_dotconf.py
@@ -3,6 +3,7 @@
 import os
 from optparse import OptionParser
 from .. import configfile
+from .. import __version__
 
 __all__ = ['command']
 
@@ -12,7 +13,7 @@ def command(args):
 	"""
 	op = OptionParser(
 		"%prog [--stdout] [-f settings] postgresql.conf ([param=val]|[param])*",
-		version = '1.0'
+		version = __version__
 	)
 	op.add_option(
 		'-f', '--file',
diff --git a/postgresql/bin/pg_python.py b/postgresql/bin/pg_python.py
@@ -13,6 +13,7 @@
 import contextlib
 from .. import clientparameters
 from ..resolved import pythoncommand as pycmd
+from .. import __version__
 
 from ..driver import default as pg_driver
 from .. import exceptions as pg_exc
@@ -30,7 +31,7 @@
 def command(argv = sys.argv):
 	p = clientparameters.DefaultParser(
 		"%prog [connection options] [script] ...",
-		version = '1.0',
+		version = __version__,
 		option_list = default_options
 	)
 	p.disable_interspersed_args()
diff --git a/postgresql/bin/pg_tin.py b/postgresql/bin/pg_tin.py
@@ -19,6 +19,7 @@
 
 from .. import versionstring as pg_version
 from ..cluster import Cluster
+from .. import __version__
 
 from gettext import gettext as _
 
@@ -219,7 +220,7 @@ def command(args):
 
 	op = optparse.OptionParser(
 		COMMAND_HELP,
-		version = '1.0',
+		version = __version__,
 	)
 	op.allow_interspersed_args = False
 
diff --git a/postgresql/bin/pg_withcluster.py b/postgresql/bin/pg_withcluster.py
@@ -6,13 +6,15 @@
 import subprocess as sp
 import getpass
 from optparse import OptionParser
-from postgresql.cluster import Cluster
-from postgresql.installation import Installation
 
-def main(args = sys.argv):
+from ..cluster import Cluster
+from ..installation import Installation
+from .. import __version__
+
+def command(argv = sys.argv):
 	op = OptionParser(
 		"%prog [-p] [--version] {[setting=value], ...} [pg_config] command",
-		version = '1.0'
+		version = __version__
 	)
 	op.allow_interspersed_args = False
 	op.add_option(
@@ -95,4 +97,4 @@ def main(args = sys.argv):
 		c.drop()
 
 if __name__ == '__main__':
-	sys.exit(main())
+	sys.exit(command(argv=sys.argv))
diff --git a/postgresql/resolved/pythoncommand.py b/postgresql/resolved/pythoncommand.py
@@ -230,6 +230,10 @@ def __init__(self, *args, **kw):
 		self.register_backslash(r'\x', self.bs_x,
 			"Execute the Python command within this process.")
 
+	def interact(self, *args, **kw):
+		self.showhelp(None, None)
+		super().interact(*args,**kw)
+
 	def register_backslash(self, bscmd, meth, doc):
 		self.bsc_map[bscmd] = (meth, doc)
 
@@ -308,7 +312,7 @@ def execfile(self, filepath):
 			src.close()
 		if co is not None:
 			try:
-				exec(co, self.globals, self.locals)
+				exec(co, self.locals, self.locals)
 			except:
 				e, v, tb = sys.exc_info()
 				print_exception(e, v, tb.tb_next or tb)
@@ -330,7 +334,7 @@ def bs_E(self, cmd, arg):
 		self.editfiles([self.resolve_path(x) for x in self.split(arg) or ('',)])
 
 	def bs_e(self, cmd, arg):
-		'edit and execute the files'
+		'edit *and* execute the files'
 		filepaths = [self.resolve_path(x) for x in self.split(arg) or ('',)]
 		self.editfiles(filepaths)
 		for x in filepaths:
@@ -341,7 +345,10 @@ def bs_x(self, cmd, arg):
 		if len(cmd) > 1:
 			a = self.split(arg)
 			a.insert(0, '\\x')
-			rv = command(args = a)
+			try:
+				rv = command(argv = a)
+			except SystemExit as se:
+				rv = se.code
 			self.write("[Return Value: %d]%s" %(rv, os.linesep))
 
 	def push(self, line):
@@ -591,8 +598,8 @@ def get_main_source(self):
 		if path is not None:
 			return loader.get_source(path)
 
-def command_execution(args = sys.argv):
-	'create an execution using the given args'
+def command_execution(argv = sys.argv):
+	'create an execution using the given argv'
 	# The pwd should be in the path for python commands.
 	# setuptools' console_scripts appear to strip this out.
 	if '' not in sys.path:
@@ -604,15 +611,15 @@ def command_execution(args = sys.argv):
 	)
 	op.disable_interspersed_args()
 	op.add_options(default_optparse_options)
-	co, ca = op.parse_args(args[1:])
+	co, ca = op.parse_args(argv[1:])
 
 	return Execution(ca,
 		context = getattr(co, 'python_context', ()),
 		loader = getattr(co, 'python_main', None),
 	)
 
-def command(args = sys.argv):
-	return command_execution(args = args)(
+def command(argv = sys.argv):
+	return command_execution(argv = argv)(
 		context = postmortem(os.environ.get('PYTHON_POSTMORTEM'))
 	)
 
