Permalink
Browse files

Whitespace and typos

Fixed copyright date
  • Loading branch information...
defnull committed Aug 16, 2012
1 parent 715c73e commit 4047cda0ab5aaab2472888c3fe0863edf4bd9bc6
Showing with 9 additions and 10 deletions.
  1. +1 −1 LICENSE
  2. +5 −6 bottle.py
  3. +3 −3 docs/changelog.rst
View
@@ -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
View
@@ -9,7 +9,7 @@
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 @@ def __getattr__(self, name):
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 @@ def __iter__(self):
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 @@ def add_path(self, path, base=None, index=None, create=False):
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 @@ def wrapper(*args, **kwargs):
%%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()
View
@@ -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 <http://docs.pylonsproject.org/projects/waitress/en/latest/>`_.
* 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.

0 comments on commit 4047cda

Please sign in to comment.