diff options
| author | Igor Stroh <rennpferd@gmail.com> | 2015-06-10 22:37:57 +0200 |
|---|---|---|
| committer | Igor Stroh <rennpferd@gmail.com> | 2015-06-10 22:37:57 +0200 |
| commit | e7a731c1dc6d6e56acf978c44ad9e4f095695b8d (patch) | |
| tree | 1e9c27c45db13e15d4ae505a5bdc765bd8b507a6 | |
| parent | 08110f881e2fc29f48d1983c1f86a4e3b65ba8c3 (diff) | |
| download | pyramid-e7a731c1dc6d6e56acf978c44ad9e4f095695b8d.tar.gz pyramid-e7a731c1dc6d6e56acf978c44ad9e4f095695b8d.tar.bz2 pyramid-e7a731c1dc6d6e56acf978c44ad9e4f095695b8d.zip | |
make sure user input is py2.x/py3 compatible
- Use input() in python3 and raw_input in python 2.x
- Remoced unused local variables
| -rw-r--r-- | pyramid/scaffolds/__init__.py | 4 | ||||
| -rw-r--r-- | pyramid/scripts/pcreate.py | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/pyramid/scaffolds/__init__.py b/pyramid/scaffolds/__init__.py index c993ce5f9..4e811a42b 100644 --- a/pyramid/scaffolds/__init__.py +++ b/pyramid/scaffolds/__init__.py @@ -18,10 +18,6 @@ class PyramidTemplate(Template): misnamings (such as naming a package "site" or naming a package logger "root". """ - if vars['package'] == 'site': - raise ValueError('Sorry, you may not name your package "site". ' - 'The package name "site" has a special meaning in ' - 'Python. Please name it anything except "site".') vars['random_string'] = native_(binascii.hexlify(os.urandom(20))) package_logger = vars['package'] if package_logger == 'root': diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py index b59c1d8b4..2c05d87b2 100644 --- a/pyramid/scripts/pcreate.py +++ b/pyramid/scripts/pcreate.py @@ -9,6 +9,8 @@ import pkg_resources import re import sys +user_input = input if sys.version_info[0] == 3 else raw_input + _bad_chars_re = re.compile('[^a-zA-Z0-9_]') def main(argv=sys.argv, quiet=False): @@ -92,8 +94,6 @@ class PCreateCommand(object): @property def project_vars(self): - options = self.options - args = self.args output_dir = self.output_path project_name = os.path.basename(os.path.split(output_dir)[1]) pkg_name = _bad_chars_re.sub( @@ -202,11 +202,11 @@ class PCreateCommand(object): if self.options.force_bad_name: return True self.out('Package "{}" already exists, are you sure you want ' - 'to use it as your project\'s name?'.format(pkg_name)) + 'to use it as your project\'s name?'.format(pkg_name)) return self.confirm_bad_name('Really use "{}"?: '.format(pkg_name)) def confirm_bad_name(self, prompt): # pragma: no cover - answer = raw_input('{} [y|N]: '.format(prompt)) + answer = user_input('{} [y|N]: '.format(prompt)) return answer.strip().lower() == 'y' if __name__ == '__main__': # pragma: no cover |