diff --git a/.gitignore b/.gitignore index 943812bc3..0f5e389b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ *.egg-info/ -aspen/tests/log +pando/tests/log env *.pyc distribute-* diff --git a/Changelog.md b/Changelog.md index 7f4c596ad..2f7e99aad 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,5 @@ -Aspen.py Changelog -================== +Pando Changelog +=============== 0.42 - Released Thu Sept 10 2015 by @whit537 -------------------------------------------- diff --git a/MANIFEST.in b/MANIFEST.in index 4f3578b08..86ac2d384 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ include COPYRIGHT include ez_setup.py include version.txt -include aspen/configuration/mime.types -graft aspen/www +include pando/configuration/mime.types +graft pando/www diff --git a/README.rst b/README.rst index 18e7837f0..74647527b 100644 --- a/README.rst +++ b/README.rst @@ -1,26 +1,26 @@ -Aspen is a Python web framework. Simplates are the main attraction. +Pando is a Python web framework. Simplates are the main attraction. Installation, Testing, and License ================================== -``aspen`` is available on `GitHub`_ and on `PyPI`_:: +``pando`` is available on `GitHub`_ and on `PyPI`_:: - $ pip install aspen + $ pip install pando We test against 64-bit Python 2.7 on Linux: |travis| And we test against 32- and 64-bit Python 2.7 on Windows: |appveyor| -``aspen`` is MIT-licensed. +``pando`` is MIT-licensed. -.. _GitHub: https://github.com/AspenWeb/aspen.py -.. _PyPI: https://pypi.python.org/pypi/aspen -.. |travis| image:: https://img.shields.io/travis/AspenWeb/aspen.py/master.svg - :target: https://travis-ci.org/AspenWeb/aspen.py +.. _GitHub: https://github.com/AspenWeb/pando.py +.. _PyPI: https://pypi.python.org/pypi/pando +.. |travis| image:: https://img.shields.io/travis/AspenWeb/pando.py/master.svg + :target: https://travis-ci.org/AspenWeb/pando.py :alt: Linux build status -.. |appveyor| image:: https://img.shields.io/appveyor/ci/AspenWeb/aspen-py/master.svg - :target: https://ci.appveyor.com/project/AspenWeb/aspen-py +.. |appveyor| image:: https://img.shields.io/appveyor/ci/AspenWeb/pando-py/master.svg + :target: https://ci.appveyor.com/project/AspenWeb/pando-py :alt: Windows build status diff --git a/appveyor.yml b/appveyor.yml index 1da258d78..e5b30dba7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,9 +22,6 @@ build: false # Not a C# project, build stuff at the test step instead. test_script: - # extra debug for the dispatcher (at least) - #- "SET ASPEN_DEBUG=1" - # Build the compiled extension and run the project tests - "python build.py analyse" diff --git a/aspen_io.py b/aspen_io.py index a6d0484bd..fe40b3a4f 100644 --- a/aspen_io.py +++ b/aspen_io.py @@ -2,8 +2,8 @@ """ import os import os.path -from aspen.configuration import parse -from aspen.website import Website +from pando.configuration import parse +from pando.website import Website distribution_root = os.path.dirname(__file__) website = Website( www_root=os.path.join(distribution_root, 'doc') @@ -57,7 +57,7 @@ def screenshot(short, imgtype='png', href=''): ).decode('US-ASCII')) opts['base'] = '' -# this is a dirty nasty hack. We should store the version in the aspen module somewhere +# this is a dirty nasty hack. We should store the version in the pando module somewhere opts['version'] = open(os.path.join(website.www_root,'..','version.txt')).read()[:-len('-dev')] # no idea why this doesn't work @@ -68,5 +68,5 @@ def screenshot(short, imgtype='png', href=''): if __name__ == '__main__': - from aspen import serve + from pando import serve serve(website) diff --git a/build.py b/build.py index 324aeccdc..982119049 100644 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ # Core Executables # ================ -ASPEN_DEPS = [ +PANDO_DEPS = [ 'python-mimeparse>=0.1.4', 'first>=2.0.1', 'algorithm>=1.0.0', @@ -26,7 +26,7 @@ ENV_ARGS = [ '-m', 'virtualenv', - '--prompt=[aspen]', + '--prompt=[pando]', ] @@ -68,16 +68,16 @@ def env(): def deps(): - """set up an environment able to run aspen""" + """set up an environment able to run pando""" _deps() def _deps(envdir='env'): envdir = _env(envdir) - v = shell(_virt('python', envdir), '-c', 'import aspen; print("found")', ignore_status=True) + v = shell(_virt('python', envdir), '-c', 'import pando; print("found")', ignore_status=True) if b"found" in v: return envdir - for dep in ASPEN_DEPS: + for dep in PANDO_DEPS: run(_virt('pip', envdir), 'install', dep) run(_virt('python', envdir), 'setup.py', 'develop') return envdir @@ -167,7 +167,7 @@ def pylint(): envdir = _env() run(_virt('pip', envdir), 'install', 'pylint') run(_virt('pylint', envdir), '--rcfile=.pylintrc', - 'aspen', '|', 'tee', 'pylint.out', shell=True, ignore_status=True) + 'pando', '|', 'tee', 'pylint.out', shell=True, ignore_status=True) def test_cov(): @@ -177,7 +177,7 @@ def test_cov(): '--cov-report', 'term', '--cov-report', 'xml', '--cov-report', 'html', - '--cov', 'aspen', + '--cov', 'pando', 'tests/', ignore_status=False) @@ -245,7 +245,7 @@ def jython_test(): '--junitxml=jython-testresults.xml', 'tests', '--cov-report', 'term', '--cov-report', 'xml', - '--cov', 'aspen', + '--cov', 'pando', ignore_status=True) def clean_jtest(): diff --git a/docs/conf.py b/docs/conf.py index 44b9b3f3f..7cff656b3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Aspen documentation build configuration file, created by +# Pando documentation build configuration file, created by # sphinx-quickstart on Mon Feb 24 15:00:43 2014. # # This file is execfile()d with the current directory set to its containing dir. @@ -40,7 +40,7 @@ master_doc = 'index' # General information about the project. -project = u'Aspen' +project = u'Pando' copyright = u'2014, Chad Whitacre, Paul Jimenez, and others' # The version info for the project you're documenting, acts as replacement for @@ -164,7 +164,7 @@ #html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'Aspendoc' +htmlhelp_basename = 'Pandodoc' # -- Options for LaTeX output -------------------------------------------------- @@ -183,7 +183,7 @@ # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'Aspen.tex', u'Aspen Documentation', + ('index', 'Pando.tex', u'Pando Documentation', u'Chad Whitacre, Paul Jimenez, and others', 'manual'), ] @@ -213,7 +213,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'aspen', u'Aspen Documentation', + ('index', 'pando', u'Pando Documentation', [u'Chad Whitacre, Paul Jimenez, and others'], 1) ] @@ -227,8 +227,8 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'Aspen', u'Aspen Documentation', - u'Chad Whitacre, Paul Jimenez, and others', 'Aspen', 'One line description of project.', + ('index', 'Pando', u'Pando Documentation', + u'Chad Whitacre, Paul Jimenez, and others', 'Pando', 'One line description of project.', 'Miscellaneous'), ] diff --git a/docs/index.rst b/docs/index.rst index d9d758bf8..cb633fea1 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,7 +1,7 @@ -Aspen +Pando ===== -.. automodule:: aspen +.. automodule:: pando :members: :member-order: bysource :special-members: @@ -10,207 +10,207 @@ Aspen Library Reference ----------------- -.. automodule:: aspen.algorithms +.. automodule:: pando.algorithms :members: :member-order: bysource :special-members: -.. automodule:: aspen.algorithms.website +.. automodule:: pando.algorithms.website :members: :member-order: bysource :special-members: -.. automodule:: aspen.auth +.. automodule:: pando.auth :members: :member-order: bysource :special-members: -.. automodule:: aspen.auth.cookie +.. automodule:: pando.auth.cookie :members: :member-order: bysource :special-members: -.. automodule:: aspen.auth.httpbasic +.. automodule:: pando.auth.httpbasic :members: :member-order: bysource :special-members: -.. automodule:: aspen.auth.httpdigest +.. automodule:: pando.auth.httpdigest :members: :member-order: bysource :special-members: -.. automodule:: aspen.backcompat +.. automodule:: pando.backcompat :members: :member-order: bysource :special-members: -.. automodule:: aspen.configuration +.. automodule:: pando.configuration :members: :member-order: bysource :special-members: -.. automodule:: aspen.configuration.exceptions +.. automodule:: pando.configuration.exceptions :members: :member-order: bysource :special-members: -.. automodule:: aspen.configuration.options +.. automodule:: pando.configuration.options :members: :member-order: bysource :special-members: -.. automodule:: aspen.configuration.parse +.. automodule:: pando.configuration.parse :members: :member-order: bysource :special-members: -.. automodule:: aspen.context +.. automodule:: pando.context :members: :member-order: bysource :special-members: -.. automodule:: aspen.dispatcher +.. automodule:: pando.dispatcher :members: :member-order: bysource :special-members: -.. automodule:: aspen.exceptions +.. automodule:: pando.exceptions :members: :member-order: bysource :special-members: -.. automodule:: aspen.http +.. automodule:: pando.http :members: :member-order: bysource :special-members: -.. automodule:: aspen.http.baseheaders +.. automodule:: pando.http.baseheaders :members: :member-order: bysource :special-members: -.. automodule:: aspen.http.mapping +.. automodule:: pando.http.mapping :members: :member-order: bysource :special-members: -.. automodule:: aspen.http.request +.. automodule:: pando.http.request :members: :member-order: bysource :special-members: -.. automodule:: aspen.http.response +.. automodule:: pando.http.response :members: :member-order: bysource :special-members: -.. automodule:: aspen.json_ +.. automodule:: pando.json_ :members: :member-order: bysource :special-members: -.. automodule:: aspen.logging +.. automodule:: pando.logging :members: :member-order: bysource :special-members: -.. automodule:: aspen.renderers +.. automodule:: pando.renderers :members: :member-order: bysource :special-members: -.. automodule:: aspen.renderers.json_dump +.. automodule:: pando.renderers.json_dump :members: :member-order: bysource :special-members: -.. automodule:: aspen.renderers.stdlib_format +.. automodule:: pando.renderers.stdlib_format :members: :member-order: bysource :special-members: -.. automodule:: aspen.renderers.stdlib_percent +.. automodule:: pando.renderers.stdlib_percent :members: :member-order: bysource :special-members: -.. automodule:: aspen.renderers.stdlib_template +.. automodule:: pando.renderers.stdlib_template :members: :member-order: bysource :special-members: -.. automodule:: aspen.resources +.. automodule:: pando.resources :members: :member-order: bysource :special-members: -.. automodule:: aspen.resources.dynamic_resource +.. automodule:: pando.resources.dynamic_resource :members: :member-order: bysource :special-members: -.. automodule:: aspen.resources.negotiated_resource +.. automodule:: pando.resources.negotiated_resource :members: :member-order: bysource :special-members: -.. automodule:: aspen.resources.pagination +.. automodule:: pando.resources.pagination :members: :member-order: bysource :special-members: -.. automodule:: aspen.resources.rendered_resource +.. automodule:: pando.resources.rendered_resource :members: :member-order: bysource :special-members: -.. automodule:: aspen.resources.resource +.. automodule:: pando.resources.resource :members: :member-order: bysource :special-members: -.. automodule:: aspen.resources.static_resource +.. automodule:: pando.resources.static_resource :members: :member-order: bysource :special-members: -.. automodule:: aspen.testing +.. automodule:: pando.testing :members: :member-order: bysource :special-members: -.. automodule:: aspen.testing.client +.. automodule:: pando.testing.client :members: :member-order: bysource :special-members: -.. automodule:: aspen.testing.harness +.. automodule:: pando.testing.harness :members: :member-order: bysource :special-members: -.. automodule:: aspen.testing.pytest_fixtures +.. automodule:: pando.testing.pytest_fixtures :members: :member-order: bysource :special-members: -.. automodule:: aspen.typecasting +.. automodule:: pando.typecasting :members: :member-order: bysource :special-members: -.. automodule:: aspen.utils +.. automodule:: pando.utils :members: :member-order: bysource :special-members: -.. automodule:: aspen.website +.. automodule:: pando.website :members: :member-order: bysource :special-members: -.. automodule:: aspen.wsgi +.. automodule:: pando.wsgi :members: :member-order: bysource :special-members: diff --git a/fcgi_aspen.py b/fcgi_pando.py similarity index 54% rename from fcgi_aspen.py rename to fcgi_pando.py index f8d9026c2..e72d8610e 100644 --- a/fcgi_aspen.py +++ b/fcgi_pando.py @@ -1,7 +1,7 @@ -"""Run the aspen webserver as a FastCGI process. Requires that you have flup installed. +"""Run the pando webserver as a FastCGI process. Requires that you have flup installed. """ -from aspen.wsgi import website +from pando.wsgi import website from flup.server.fcgi import WSGIServer def main(): diff --git a/pando/__init__.py b/pando/__init__.py index ae761c7d2..02d99217c 100644 --- a/pando/__init__.py +++ b/pando/__init__.py @@ -1,4 +1,4 @@ -"""This is Aspen, a dynamic Jekyll for Python. +"""This is Pando, a Python web framework. Installation diff --git a/pando/__main__.py b/pando/__main__.py index 712fd5298..e4413f2d3 100644 --- a/pando/__main__.py +++ b/pando/__main__.py @@ -2,7 +2,7 @@ python -m pando =============== -Aspen ships with a server (wsgiref.simple_server) that is +Pando ships with a server (wsgiref.simple_server) that is suitable for development and testing. It can be invoked via: python -m pando @@ -10,7 +10,7 @@ though even for development you'll likely want to specify a project root, so a more likely incantation is: - ASPEN_PROJECT_ROOT=/path/to/wherever python -m pando + PANDO_PROJECT_ROOT=/path/to/wherever python -m pando For production deployment, you should probably deploy using a higher performance WSGI server like Gunicorn, uwsgi, Spawning, or the like. @@ -56,8 +56,8 @@ if __name__ == '__main__': logging.config.dictConfig(logging_cfg) port = int(os.environ.get('PORT', '8080')) # get the port, defaulting to 8080 - host = os.environ.get('ASPEN_HOST', '0.0.0.0') # get the IP to bind to, or default to all - project_root = os.environ.get('ASPEN_PROJECT_ROOT', None) + host = os.environ.get('PANDO_HOST', '0.0.0.0') # get the IP to bind to, or default to all + project_root = os.environ.get('PANDO_PROJECT_ROOT', None) log_dammit("Greetings, program! Now serving on http://{0}:{1}/.".format(host, port)) website = website.Website(project_root=project_root) make_server(host, port, website).serve_forever() diff --git a/pando/algorithms/website.py b/pando/algorithms/website.py index 7cb28e48b..ac3ecf44e 100644 --- a/pando/algorithms/website.py +++ b/pando/algorithms/website.py @@ -2,9 +2,9 @@ pando.algorithms.website ~~~~~~~~~~~~~~~~~~~~~~~~ -These functions comprise the request processing functionality of Aspen. +These functions comprise the request processing functionality of Pando. -The order of functions in this module defines Aspen algorithm for request +The order of functions in this module defines Pando algorithm for request processing. The actual parsing is done by Algorithm.from_dotted_name(): http://algorithm-py.readthedocs.org/en/1.0.0/#algorithm.Algorithm.from_dotted_name diff --git a/pando/auth/__init__.py b/pando/auth/__init__.py index cd15bb95f..efe121db7 100644 --- a/pando/auth/__init__.py +++ b/pando/auth/__init__.py @@ -2,7 +2,7 @@ pando.auth ++++++++++ -Aspen's Auth modules. +Pando's Auth modules. Currently: diff --git a/pando/auth/cookie.py b/pando/auth/cookie.py index deeba9e8e..d7aacdea4 100644 --- a/pando/auth/cookie.py +++ b/pando/auth/cookie.py @@ -2,7 +2,7 @@ pando.auth.cookie ~~~~~~~~~~~~~~~~~ -This is a cookie authentication implementation for Aspen. +This is a cookie authentication implementation for Pando. """ from __future__ import absolute_import from __future__ import division @@ -84,15 +84,15 @@ def outbound(response): if DOMAIN is not None: # Browser default is the domain of the resource requested. - # Aspen default is the browser default. + # Pando default is the browser default. cookie['domain'] = DOMAIN if PATH is not None: # XXX What's the browser default? Probably /? Or current dir? - # Aspen default is "/". + # Pando default is "/". cookie['path'] = PATH if HTTPONLY is not None: # Browser default is to allow access from JavaScript. - # Aspen default is to prevent access from JavaScript. + # Pando default is to prevent access from JavaScript. cookie['httponly'] = HTTPONLY diff --git a/pando/auth/httpbasic.py b/pando/auth/httpbasic.py index 0023e46bc..5a26133c1 100644 --- a/pando/auth/httpbasic.py +++ b/pando/auth/httpbasic.py @@ -2,7 +2,7 @@ pando.auth.httpbasic ~~~~~~~~~~~~~~~~~~~~ -HTTP BASIC Auth module for Aspen. +HTTP BASIC Auth module for Pando. To use: @@ -61,7 +61,7 @@ def logout(self): class BasicAuth(object): - """An HTTP BASIC AUTH handler for Aspen.""" + """An HTTP BASIC AUTH handler for Pando.""" def __init__(self, verify_password, html=None, realm='protected'): """Constructor for an HTTP BASIC AUTH handler. diff --git a/pando/auth/httpdigest.py b/pando/auth/httpdigest.py index 0f23dd773..bb9f46d14 100644 --- a/pando/auth/httpdigest.py +++ b/pando/auth/httpdigest.py @@ -16,7 +16,7 @@ class MalformedAuthenticationHeader(Exception): pass ## wrapper bits -class AspenHTTPProvider: +class PandoHTTPProvider: """An abstraction layer between the Auth object and http-framework specific code.""" @@ -71,11 +71,11 @@ def get_digest(username, realm): website.algorithm.insert_after('parse_environ_into_request', auth) """ kwargs = kw.copy() - kwargs['http_provider'] = AspenHTTPProvider + kwargs['http_provider'] = PandoHTTPProvider auth = Auth(*args, **kwargs) def httpdigest_inbound_responder(request): """generated hook function""" - request.auth = AspenAuthWrapper(auth, request) + request.auth = PandoAuthWrapper(auth, request) authed, response = auth.authorized(request) if not authed: #print "Response: %s" % repr(response.headers) @@ -84,7 +84,7 @@ def httpdigest_inbound_responder(request): return httpdigest_inbound_responder -class AspenAuthWrapper(object): +class PandoAuthWrapper(object): """Convenience class to put on a request that has a reference to the request its on so accessing auth methods doesn't require repeating the request arg. diff --git a/pando/body_parsers.py b/pando/body_parsers.py index bc95ef3a0..58d43c032 100644 --- a/pando/body_parsers.py +++ b/pando/body_parsers.py @@ -2,7 +2,7 @@ pando.body_parsers ++++++++++++++++++ -Aspen body parsers are optional ways to enable Aspen to uniformly +Pando body parsers are optional ways to enable Pando to uniformly parse POST body content according to its supplied Content-Type. A body parser has the signature: diff --git a/pando/configuration/__init__.py b/pando/configuration/__init__.py index d5d544d3e..11a8af143 100644 --- a/pando/configuration/__init__.py +++ b/pando/configuration/__init__.py @@ -130,7 +130,7 @@ def configure(self, **kwargs): msgs.append(self._set(name, default, None, "default", '')) # set from the environment - envvar = 'ASPEN_' + name.upper() + envvar = 'PANDO_' + name.upper() value = os.environ.get(envvar, '').strip() if value: msgs.append(self.set( name @@ -182,7 +182,7 @@ def safe_getcwd(errorstr): % self.project_root) cwd = safe_getcwd("Could not get a current working " "directory. You can specify " - "ASPEN_PROJECT_ROOT in the environment, " + "PANDO_PROJECT_ROOT in the environment, " "or project_root in kwargs.") self.project_root = os.path.join(cwd, self.project_root) @@ -200,7 +200,7 @@ def safe_getcwd(errorstr): if self.www_root is None: self.www_root = safe_getcwd("Could not get a current working " "directory. You can specify " - "ASPEN_WWW_ROOT in the environment, " + "PANDO_WWW_ROOT in the environment, " "or www_root in kwargs.") self.www_root = os.path.realpath(self.www_root) diff --git a/pando/dispatcher.py b/pando/dispatcher.py index cebebde98..25f06a5be 100644 --- a/pando/dispatcher.py +++ b/pando/dispatcher.py @@ -2,7 +2,7 @@ pando.dispatcher ++++++++++++++++ -Implement Aspen's filesystem dispatch algorithm. +Implement Pando's filesystem dispatch algorithm. """ from __future__ import absolute_import from __future__ import division @@ -28,7 +28,7 @@ def debug_stdout(func): except Exception: print("DEBUG: " + repr(r)) -debug = debug_stdout if 'ASPEN_DEBUG' in os.environ else debug_noop +debug = debug_stdout if 'PANDO_DEBUG' in os.environ else debug_noop def splitext(name): diff --git a/pando/exceptions.py b/pando/exceptions.py index 08d4b85e8..b1ddd30a2 100644 --- a/pando/exceptions.py +++ b/pando/exceptions.py @@ -2,7 +2,7 @@ pando.exceptions ++++++++++++++++ -Exceptions used by Aspen +Exceptions used by Pando """ from __future__ import absolute_import from __future__ import division diff --git a/pando/http/request.py b/pando/http/request.py index eae8f21e0..6d7a654bb 100644 --- a/pando/http/request.py +++ b/pando/http/request.py @@ -51,7 +51,7 @@ # WSGI Do Our Best # ================ -# Aspen is jealous. It wants to pretend that it parsed the HTTP Request itself, +# Pando is jealous. It wants to pretend that it parsed the HTTP Request itself, # instead of letting some WSGI server or library do the work for it. Here are # routines for going from WSGI back to HTTP. Since WSGI is lossy, we end up # with a Dr. Frankenstein's HTTP message. diff --git a/pando/json_.py b/pando/json_.py index 53e685808..2dd0008e0 100644 --- a/pando/json_.py +++ b/pando/json_.py @@ -30,8 +30,8 @@ # class or type that needs extra work to decode to JSON. For example, support # for the decimal.Decimal class was added in simplejson 2.1, which isn't in the # stdlib version as of 2.7/3.2. Support for classes from the datetime module -# isn't in simplejson as of 2.3.2. Since Aspen takes on ownership of JSON -# encoding, we need to give Aspen users a way to register (and unregister, I +# isn't in simplejson as of 2.3.2. Since Pando takes on ownership of JSON +# encoding, we need to give Pando users a way to register (and unregister, I # guess) new encoders. You can do this by calling dumps with the cls keyword, # but we call dumps for you for JSON resources, so we want a way to influence # decoding that doesn't depend on dumps. And this is that way: @@ -63,7 +63,7 @@ def unregister_encoder(cls): # Be lazy. # ======== -# Allow Aspen to run without JSON support. In practice that means that Python +# Allow Pando to run without JSON support. In practice that means that Python # 2.5 users won't be able to use JSON resources. if _json is not None: diff --git a/pando/logging.py b/pando/logging.py index 2cf74975e..6ec53ab07 100644 --- a/pando/logging.py +++ b/pando/logging.py @@ -2,7 +2,7 @@ pando.logging +++++++++++++ -Aspen logging convenience wrappers +Pando logging convenience wrappers """ from __future__ import absolute_import diff --git a/pando/simplates/renderers/__init__.py b/pando/simplates/renderers/__init__.py index c6eaacd0a..bd31d276c 100644 --- a/pando/simplates/renderers/__init__.py +++ b/pando/simplates/renderers/__init__.py @@ -26,7 +26,7 @@ A Renderer is instantiated by a Factory, which is a class that is itself instantied with one argument: - configuration an Aspen configuration object + configuration an Pando configuration object Instances of each Renderer subclass are callables that take five arguments and @@ -69,9 +69,9 @@ class CheeseFactory(Factory): I like CHEESE!!!!!!! -If you write a new renderer for inclusion in the base Aspen distribution, -please work with Aspen's existing reloading machinery, etc. as much as -possible. Use the existing template shims as guidelines, and if Aspen's +If you write a new renderer for inclusion in the base Pando distribution, +please work with Pando's existing reloading machinery, etc. as much as +possible. Use the existing template shims as guidelines, and if Pando's machinery is inadequate for some reason let's evolve the machinery so all renderers behave consistently for users. Thanks. diff --git a/pando/testing/client.py b/pando/testing/client.py index 58328d126..4bbd01ac9 100644 --- a/pando/testing/client.py +++ b/pando/testing/client.py @@ -70,7 +70,7 @@ def encode_multipart(boundary, data): class Client(object): - """This is the Aspen test client. It is probably useful to you. + """This is the Pando test client. It is probably useful to you. """ def __init__(self, www_root=None, project_root=None): @@ -146,7 +146,7 @@ def hit(self, method, path='/', data=None, body=b'', content_type=MULTIPART_CONT def build_wsgi_environ(self, method, path, body, content_type, **kw): - # NOTE that in Aspen (request.py make_franken_headers) only headers + # NOTE that in Pando (request.py make_franken_headers) only headers # beginning with ``HTTP`` are included in the request - and those are # changed to no longer include ``HTTP``. There are currently 2 # exceptions to this: ``'CONTENT_TYPE'``, ``'CONTENT_LENGTH'`` which diff --git a/pando/testing/harness.py b/pando/testing/harness.py index 1ff563ae2..f1c35e117 100644 --- a/pando/testing/harness.py +++ b/pando/testing/harness.py @@ -24,7 +24,7 @@ def teardown(): - reset the current working directory - remove FSFIX = %{tempdir}/fsfix - - reset Aspen's global state + - reset Pando's global state - clear out sys.path_importer_cache """ @@ -37,7 +37,7 @@ def teardown(): class Harness(object): - """A harness to be used in the Aspen test suite itself. Probably not useful to you. + """A harness to be used in the Pando test suite itself. Probably not useful to you. """ def __init__(self): diff --git a/pando/www/autoindex.html.spt b/pando/www/autoindex.html.spt index 23bcd0ae1..14f452656 100644 --- a/pando/www/autoindex.html.spt +++ b/pando/www/autoindex.html.spt @@ -156,7 +156,7 @@ pando_version = pando.__version__
diff --git a/setup.py b/setup.py index 484ca38cf..94a7ccf13 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from setuptools import find_packages, setup -from build import ASPEN_DEPS, TEST_DEPS +from build import PANDO_DEPS, TEST_DEPS version = open('version.txt').read() @@ -23,19 +23,19 @@ ] setup( author = 'Chad Whitacre et al.' - , author_email = 'team@aspen.io' + , author_email = 'team@pando.io' , classifiers = classifiers - , description = ('Aspen is a Python web framework. ' + , description = ('Pando is a Python web framework. ' 'Simplates are the main attraction.') - , entry_points = {'console_scripts': ['fcgi_aspen = fcgi_aspen:main [fcgi]']} + , entry_points = {'console_scripts': ['fcgi_pando = fcgi_pando:main [fcgi]']} , name = 'pando' , packages = find_packages(exclude=['pando.tests', 'pando.tests.*']) - , py_modules = ['fcgi_aspen'] - , url = 'http://aspen.io/' + , py_modules = ['fcgi_pando'] + , url = 'http://pando.io/' , version = version , zip_safe = False , package_data = {'pando': ['www/*', 'configuration/mime.types']} - , install_requires = ASPEN_DEPS + , install_requires = PANDO_DEPS , extras_require = {'fcgi': ['flup']} , tests_require = TEST_DEPS )