diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-07 16:08:37 -0800 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-07 16:08:37 -0800 |
| commit | eb6298ca370ee5fcf390e85769f928a85f7060e8 (patch) | |
| tree | 8489923d74211f26a3c6de02802fa51adc5dec7d | |
| parent | 3f13ecd7bbc10ee59c4df980ef6e75aed7c767a6 (diff) | |
| parent | 8751ae81b6d6c1bf6ccf18d522dafc38a19bbb76 (diff) | |
| download | pyramid-eb6298ca370ee5fcf390e85769f928a85f7060e8.tar.gz pyramid-eb6298ca370ee5fcf390e85769f928a85f7060e8.tar.bz2 pyramid-eb6298ca370ee5fcf390e85769f928a85f7060e8.zip | |
Merge branch 'RichardBarrell-master'
| -rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
| -rw-r--r-- | HACKING.txt | 4 | ||||
| -rw-r--r-- | pyramid/scripts/pcreate.py | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 4ac88fc15..e1af0aab1 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -149,6 +149,8 @@ Contributors - Manuel Hermann, 2011/07/11 +- Richard Barrell, 2011/11/07 + - Chris Shenton, 2011/11/07 - Ken Manheimer, 2011/11/07 diff --git a/HACKING.txt b/HACKING.txt index 0194e9bab..98ab21e10 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -42,10 +42,10 @@ checkout. $ ../env/bin/python setup.py develop - At that point, you should be able to create new Pyramid projects by using - ``paster create``:: + ``pcreate``:: $ cd ../env - $ bin/paster create -t pyramid_starter starter + $ bin/pcreate -s starter starter - And install those projects (also using ``setup.py develop``) into the virtualenv:: diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py index 47a709af4..f559e4f17 100644 --- a/pyramid/scripts/pcreate.py +++ b/pyramid/scripts/pcreate.py @@ -4,6 +4,7 @@ import optparse import os +import os.path import pkg_resources import re import sys @@ -64,8 +65,8 @@ class PCreateCommand(object): def render_scaffolds(self): options = self.options args = self.args - project_name = args[0].lstrip(os.path.sep) - output_dir = os.path.normpath(os.path.join(os.getcwd(), project_name)) + project_name = os.path.basename(args[0]) + output_dir = os.path.abspath(os.path.normpath(args[0])) pkg_name = _bad_chars_re.sub('', project_name.lower()) safe_name = pkg_resources.safe_name(project_name) egg_name = pkg_resources.to_filename(safe_name) |