summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-09 16:44:28 -0700
committerChris McDonough <chrism@plope.com>2013-10-09 16:44:28 -0700
commitc7c816fba2c97c5775452857218e136d00cc4b28 (patch)
tree09efe9dcb038faffc4c5567f96900db9781a8dd4
parentd6476034e0fed99ad8f24839cfd9a315a92e7c95 (diff)
parentba419e5b6366fae8e129e0c0e8a631b4bf508845 (diff)
downloadpyramid-c7c816fba2c97c5775452857218e136d00cc4b28.tar.gz
pyramid-c7c816fba2c97c5775452857218e136d00cc4b28.tar.bz2
pyramid-c7c816fba2c97c5775452857218e136d00cc4b28.zip
Merge pull request #1152 from Pylons/feature.run-scripts-directly
run console scripts directly
-rw-r--r--CHANGES.txt9
-rw-r--r--pyramid/scripts/pcreate.py3
-rw-r--r--pyramid/scripts/pdistreport.py3
-rw-r--r--pyramid/scripts/prequest.py3
-rw-r--r--pyramid/scripts/proutes.py2
-rw-r--r--pyramid/scripts/pserve.py3
-rw-r--r--pyramid/scripts/pshell.py2
-rw-r--r--pyramid/scripts/ptweens.py3
-rw-r--r--pyramid/scripts/pviews.py2
9 files changed, 29 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 6e73de823..a228fbb3a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,15 @@
Unreleased
==========
+Features
+--------
+
+- Pyramid's console scripts (``pserve``, ``pviews``, etc) can now be run
+ directly, allowing custom arguments to be sent to the python interpreter
+ at runtime. For example::
+
+ python -3 -m pyramid.scripts.pserve development.ini
+
Bug Fixes
---------
diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py
index 5e2240856..9a3b53b33 100644
--- a/pyramid/scripts/pcreate.py
+++ b/pyramid/scripts/pcreate.py
@@ -123,4 +123,5 @@ class PCreateCommand(object):
if not self.quiet:
print(msg)
-
+if __name__ == '__main__': # pragma: no cover
+ sys.exit(main() or 0)
diff --git a/pyramid/scripts/pdistreport.py b/pyramid/scripts/pdistreport.py
index 10edb5715..61098dc27 100644
--- a/pyramid/scripts/pdistreport.py
+++ b/pyramid/scripts/pdistreport.py
@@ -35,3 +35,6 @@ def main(argv=sys.argv, pkg_resources=pkg_resources, platform=platform.platform,
for package in packages:
out(' ', package['name'], package['version'])
out(' ', package['location'])
+
+if __name__ == '__main__': # pragma: no cover
+ sys.exit(main() or 0)
diff --git a/pyramid/scripts/prequest.py b/pyramid/scripts/prequest.py
index 8628d5a5a..2ab3b8bb9 100644
--- a/pyramid/scripts/prequest.py
+++ b/pyramid/scripts/prequest.py
@@ -175,3 +175,6 @@ class PRequestCommand(object):
else:
self.out(response.body)
return 0
+
+if __name__ == '__main__': # pragma: no cover
+ sys.exit(main() or 0)
diff --git a/pyramid/scripts/proutes.py b/pyramid/scripts/proutes.py
index 49e19deca..5784026bb 100644
--- a/pyramid/scripts/proutes.py
+++ b/pyramid/scripts/proutes.py
@@ -82,3 +82,5 @@ class PRoutesCommand(object):
self.out(fmt % (route.name, pattern, view_callable))
return 0
+if __name__ == '__main__': # pragma: no cover
+ sys.exit(main() or 0)
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index 8cceecbb3..03cbc23ab 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -984,3 +984,6 @@ def cherrypy_server_runner(
server.stop()
return server
+
+if __name__ == '__main__': # pragma: no cover
+ sys.exit(main() or 0)
diff --git a/pyramid/scripts/pshell.py b/pyramid/scripts/pshell.py
index f74402928..dd09bf457 100644
--- a/pyramid/scripts/pshell.py
+++ b/pyramid/scripts/pshell.py
@@ -217,3 +217,5 @@ class PShellCommand(object):
IPShell()
return shell
+if __name__ == '__main__': # pragma: no cover
+ sys.exit(main() or 0)
diff --git a/pyramid/scripts/ptweens.py b/pyramid/scripts/ptweens.py
index 5fe2fa120..ad52d5d8f 100644
--- a/pyramid/scripts/ptweens.py
+++ b/pyramid/scripts/ptweens.py
@@ -87,3 +87,6 @@ class PTweensCommand(object):
self.out('')
self.show_chain(tweens.implicit())
return 0
+
+if __name__ == '__main__': # pragma: no cover
+ sys.exit(main() or 0)
diff --git a/pyramid/scripts/pviews.py b/pyramid/scripts/pviews.py
index 504f583b7..5e92ec4e6 100644
--- a/pyramid/scripts/pviews.py
+++ b/pyramid/scripts/pviews.py
@@ -248,3 +248,5 @@ class PViewsCommand(object):
env['closer']()
return 0
+if __name__ == '__main__': # pragma: no cover
+ sys.exit(main() or 0)