summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-10 15:28:51 -0800
committerSteve Piercy <web@stevepiercy.com>2016-12-13 17:39:00 -0800
commit3b72e86a4dc05086fb06b89f108d4e8129ec7d7c (patch)
treed7bd8683a0134b57ffdc2e15cdd74ad6d951fa1b
parent9de2cd1d05ff62e3f75930559c2d83553df45d80 (diff)
downloadpyramid-3b72e86a4dc05086fb06b89f108d4e8129ec7d7c.tar.gz
pyramid-3b72e86a4dc05086fb06b89f108d4e8129ec7d7c.tar.bz2
pyramid-3b72e86a4dc05086fb06b89f108d4e8129ec7d7c.zip
refactor get_options to get_config_args
-rw-r--r--pyramid/scripts/pserve.py4
-rw-r--r--pyramid/tests/test_scripts/test_pserve.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index 50f4ac1d2..6581c1b7a 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -129,7 +129,7 @@ class PServeCommand(object):
if self.args.verbose > 0:
print(msg)
- def get_options(self):
+ def get_config_args(self):
restvars = self.args.config_args
return parse_vars(restvars)
@@ -165,7 +165,7 @@ class PServeCommand(object):
return 2
app_spec = self.args.config_uri
- vars = self.get_options()
+ vars = self.get_config_args()
app_name = self.args.app_name
base = os.getcwd()
diff --git a/pyramid/tests/test_scripts/test_pserve.py b/pyramid/tests/test_scripts/test_pserve.py
index 18f7c8c2f..9934fc441 100644
--- a/pyramid/tests/test_scripts/test_pserve.py
+++ b/pyramid/tests/test_scripts/test_pserve.py
@@ -36,10 +36,10 @@ class TestPServeCommand(unittest.TestCase):
self.assertEqual(result, 2)
self.assertEqual(self.out_.getvalue(), 'You must give a config file')
- def test_get_options_no_command(self):
+ def test_config_args_no_command(self):
inst = self._makeOne()
inst.args = ['foo', 'a=1', 'b=2']
- result = inst.get_options()
+ result = inst.get_config_args()
self.assertEqual(result, {'a': '1', 'b': '2'})
def test_parse_vars_good(self):