summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-11-07 13:26:02 -0800
committerChris McDonough <chrism@plope.com>2011-11-07 13:26:02 -0800
commite377a7253769cc54422b4319da3ae231b66328f5 (patch)
treeea1d1bbfe488cb52355b5efaf70a895e37f19b61
parent3f13ecd7bbc10ee59c4df980ef6e75aed7c767a6 (diff)
parent54624f36c19b3cd5d107ecd9a1f307651f561ccd (diff)
downloadpyramid-e377a7253769cc54422b4319da3ae231b66328f5.tar.gz
pyramid-e377a7253769cc54422b4319da3ae231b66328f5.tar.bz2
pyramid-e377a7253769cc54422b4319da3ae231b66328f5.zip
Merge branch 'master' of https://github.com/RichardBarrell/pyramid into RichardBarrell-master
-rw-r--r--HACKING.txt4
-rw-r--r--pyramid/scripts/pcreate.py5
2 files changed, 5 insertions, 4 deletions
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..20e531956 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.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)