From 4047cda0ab5aaab2472888c3fe0863edf4bd9bc6 Mon Sep 17 00:00:00 2001 From: Marcel Hellkamp Date: Thu, 16 Aug 2012 18:35:12 +0200 Subject: Whitespace and typos Fixed copyright date --- LICENSE | 2 +- bottle.py | 11 +++++------ docs/changelog.rst | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/LICENSE b/LICENSE index fb43a45..cdd0c70 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2011, Marcel Hellkamp. +Copyright (c) 2012, Marcel Hellkamp. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/bottle.py b/bottle.py index b838573..6fe54a1 100644 --- a/bottle.py +++ b/bottle.py @@ -9,7 +9,7 @@ Python Standard Library. Homepage and documentation: http://bottlepy.org/ -Copyright (c) 2011, Marcel Hellkamp. +Copyright (c) 2012, Marcel Hellkamp. License: MIT (see LICENSE for details) """ @@ -1259,7 +1259,7 @@ class BaseRequest(object): var = self.environ['bottle.request.ext.%s'%name] return var.__get__(self) if hasattr(var, '__get__') else var except KeyError: - raise AttributeError('Attribute %r not defined.' % name) + raise AttributeError('Attribute %r not defined.' % name) def __setattr__(self, name, value): if name == 'environ': return object.__setattr__(self, name, value) @@ -1943,7 +1943,7 @@ class WSGIFileWrapper(object): class ResourceManager(object): ''' This class manages a list of search paths and helps to find and open - aplication-bound resources (files). + application-bound resources (files). :param base: default value for :meth:`add_path` calls. :param opener: callable used to open resources. @@ -1972,11 +1972,10 @@ class ResourceManager(object): Defaults to :attr:`base` which defaults to ``os.getcwd()``. :param index: Position within the list of search paths. Defaults to last index (appends to the list). - :param create: Create non-existent search paths. Off by default. The `base` parameter makes it easy to reference files installed along with a python module or package:: - + res.add_path('./resources/', __file__) ''' base = os.path.abspath(os.path.dirname(base or self.base)) @@ -3200,7 +3199,7 @@ ERROR_PAGE_TEMPLATE = """ %%end """ % __name__ -#: A thread-safe instance of :class:`LocalRequest`. If accessed from within a +#: A thread-safe instance of :class:`LocalRequest`. If accessed from within a #: request callback, this instance always refers to the *current* request #: (even on a multithreaded server). request = LocalRequest() diff --git a/docs/changelog.rst b/docs/changelog.rst index cda94fd..dbe387f 100755 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -15,7 +15,7 @@ Release 0.11 * The new :class:`ResourceManager` interface helps locating files bundled with the application. * Added a server adapter for `waitress `_. * New :meth:`Bottle.merge` method to install all routes from one application into another. -* New :attr:`BaseRequest.app` property to get the application object that handles that request. +* New :attr:`BaseRequest.app` property to get the application object that handles a request. * Added :meth:`FormsDict.decode()` to get an all-unicode version (needed by WTForms). * :class:`MultiDict` and subclasses are now pickle-able. @@ -95,7 +95,7 @@ This release is mostly backward compatible, but some APIs are marked deprecated Release 0.8 ============ -.. rubric:: API changes +.. rubric:: API changes These changes may break compatibility with previous versions. @@ -121,7 +121,7 @@ These changes may break compatibility with previous versions. .. rubric:: New features -This is an incomplete list of new features and improved functionality. +This is an incomplete list of new features and improved functionality. * The :class:`Request` object got new properties: :attr:`Request.body`, :attr:`Request.auth`, :attr:`Request.url`, :attr:`Request.header`, :attr:`Request.forms`, :attr:`Request.files`. * The :meth:`Response.set_cookie` and :meth:`Request.get_cookie` methods are now able to encode and decode python objects. This is called a *secure cookie* because the encoded values are signed and protected from changes on client side. All pickle-able data structures are allowed. -- cgit v1.2.1