summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge pull request #1 from bbangert/masterSviatoslav Sydorenko2016-02-187-14/+40
| |\ | |/ |/| Update from upstream
* | Merge pull request #55 from haypo/toxBen Bangert2016-02-153-4/+20
|\ \ | | | | | | Add tox.ini
| * | Add tox.iniVictor Stinner2016-02-153-4/+20
|/ / | | | | | | | | | | | | | | | | | | | | tox is a nice tool to run tests: it creates virtual environments, install test dependencies and run tests. With the simple command "tox", tests are run on Python 2 and Python 3. * Create tox.ini based on .travis.yml * Modidy .travis.yml to use tox-travis: https://github.com/ryanhiebert/tox-travis * .gitignore: ignore .tox/ sub-directory created by tox.
* | Merge pull request #56 from haypo/mapper_py3Ben Bangert2016-02-132-2/+6
|\ \ | | | | | | Fix BytesWarning in Mapper.generate()
| * | Fix BytesWarning in Mapper.generate()Victor Stinner2016-02-092-2/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | When python3 is run with -bb, str(bytes) raises a BytesWarning. On Python 3, Mapper.generate() gets such BytesWarning because script_name type is str whereas cache_key type is byte. On Python 3, generate() now encodes the script_name to UTF-8 and uses bytes concatenation to fix this issue. .travis.yml: Run tests using "python -bb $(which nosetests)" to raise BytesWarning exception on bytes vs Unicode issue.
* | Merge pull request #58 from webknjaz/58-fix-empty-string-matchBen Bangert2016-02-035-9/+15
|\ \ | |/ |/| Fix empty string match
| * Add python 3.5 classifierSviatoslav Sydorenko2016-02-041-1/+2
| |
| * Log empty string fixSviatoslav Sydorenko2016-02-041-2/+2
| |
| * Test against 3.5 an nightly as well. Allow nightly to failSviatoslav Sydorenko2016-02-011-0/+5
| |
| * Ajusts empty value testsSviatoslav Sydorenko2016-02-011-2/+2
| |
| * Fix empty string matchSviatoslav Sydorenko2016-02-011-4/+4
|/
* Merge pull request #57 from sdague/masterBen Bangert2016-01-153-0/+36
|\ | | | | allow requirements to be specified on Mapper.resource
| * Add support for ``requirements`` to mapper.resourceSean Dague2016-01-133-0/+36
|/ | | | | | | | | | | | | | | | | | | | | | | | | This adds support for ``requirements`` option to mapper.resource, which makes it possible to restrict matching in urls (most often useful for capturing variables with path_prefix). In OpenStack Nova we've used the prefix_path on Mapper.resource to specify additional variables we want to capture (specifically {project_id}). Project_id is a uuid. When trying to restrict project_id to only valid uuid format a couple of issues were exposed. - #1 '/{project_id:[a-f0-9]{32}}/...' builds an incorrect regex because of the nested {} - #2 the preferred method that works on connect() to pass requirements doesn't work here (requirements are reset to only an id match) That leaves us with having to build a custom project_id match with 32 [a-f0-9] strings appended for every resource added to get the support we need without effectively vendoring our own version of Mapper.resource. This small change to allow requirements to pass through would make it possible to get this tighter validation with much smaller regexes.
* Add changelog for PR #28 re: submapper controller argument concat issue.Ben Bangert2015-08-201-0/+8
|
* Merge pull request #28 from mikepk/concat_fixBen Bangert2015-08-202-11/+74
|\ | | | | Concat fix
| * Add test for arg override behaviors in submappersmikepk2015-08-181-0/+37
| |
| * Modify submapping behavior to avoid concatenationmikepk2015-08-181-11/+37
|/ | | | | | | | | | | | | | | | | | | | | | Allow name_prefixes to concatenate in submapper nesting. Also fix the case where the concatenation behavior was being applied to all non-dictionary arguments in the submapper. This had the effect of concat'ing args like controller definition together rather than allowing submapper definitions to override parent definitions for arguments. Fix mapper so that collection_name can be None. For collections with no collection_name, adds a logic branch to handle the case cleanly and provide a reasonable path_prefix. Remove special controller case This change makes routes treat path_prefix and name_prefix as special instead of 'controller' as special. This allows any argument to be overridden in child submappers and allows the 'prefix' args to concatenate as you would expect. Add extended call signature to add_action, missing from previous commits
* Update version in setup.pyBen Bangert2015-07-211-1/+1
|
* Update changelogBen Bangert2015-07-211-0/+4
|
* Merge pull request #52 from haypo/docsBen Bangert2015-07-212-1/+2
|\ | | | | Issue #42: Fix compilation of docs
| * Issue #42: Fix compilation of docsVictor Stinner2015-07-022-1/+2
|/ | | | | | | | | * Set the HTML theme to 'classic' to fix the error: "unsupported theme option 'relbarlinkcolor' given" * Add tox.ini to easily run tests on Python 2.7 and 3.4, and to compile documentation: tox installs requirements. Use "tox -e docs" to compile the documentation, the docs directory is always cleaned up. * Add todo.rst to the documentation (add it to TOC in the index)
* Merge pull request #44 from haypo/py3Ben Bangert2015-06-1813-87/+91
|\ | | | | Port Routes to Python 3
| * Port routes to Python 3Victor Stinner2015-06-1813-87/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code now works on Python 2 and Python 3 without modifications: 2to3 is no more needed. Changes: * Drop 2to3 from setup.py: the code is now directly compatible with Python 2 and Python 3 * Add dependency to six * Drop support for Python 3.2: remove 3.2 from .travis.yml * Replace "for key, value in dict.iteritems():" with "for key, value in six.iteritems(dict):" * Use six.moves.urllib to get urllib functions * Replace unicode() with six.text_type() * Replace dict.keys() with list(dict.keys()) * Replace "dict.has_key(key)" with "key in dict" * Remove "py3where=build" from notests section of setup.cfg * Add parenthesis to print() * Replace dict.items() with list(dict.items())
* | Merge pull request #49 from a-tal/masterBen Bangert2015-06-111-3/+0
|\ \ | | | | | | built wheel is not universal
| * | built wheel is not universalAdam Talsma2015-06-111-3/+0
|/ / | | | | wheels built on python2 will not work on python3
* | Make the copyright reflect the release scope.Ben Bangert2015-05-171-1/+1
| |
* | Merge pull request #40 from anandanvivopenstack/patch-1Ben Bangert2015-05-171-1/+1
|\ \ | | | | | | Update introduction.rst
| * | Update introduction.rstanandanvivopenstack2015-02-231-1/+1
| | | | | | | | | Removed duplicated AND
* | | Merge pull request #41 from uralbash/patch-1Ben Bangert2015-05-170-0/+0
|\ \ \ | | | | | | | | fix link typo
| * | | fix link typouralbash2015-03-231-1/+1
| |/ /
* | | Merge pull request #45 from huanghao/patch-3Ben Bangert2015-05-171-2/+2
|\ \ \ | | | | | | | | Fix wrong url pattern
| * | | Fix wrong url patternhuanghao2015-04-211-2/+2
| | |/ | |/| | | | There must be leading slashes in order to match
* | | Merge pull request #46 from huanghao/patch-4Ben Bangert2015-05-171-1/+2
|\ \ \ | | | | | | | | Minor fix in docs
| * | | Minor fix in docshuanghao2015-04-211-1/+2
| |/ / | | | | | | | | | | | | As the doc says "Route paths should always begin with a slash." Add a import statement in example code, since in that place it's the first time mention this class and user can't understand what "Route" class is.
* | | Merge pull request #47 from huanghao/patch-5Ben Bangert2015-05-171-1/+1
|\ \ \ | | | | | | | | Fix typo in docs
| * | | Fix typo in docshuanghao2015-04-211-1/+1
| |/ / | | | | | | Remove useless leading slash
* | | Merge pull request #48 from alex/patch-3Ben Bangert2015-05-171-1/+1
|\ \ \ | |/ / |/| | Fixed a typo in the docs
| * | Fixed a typo in the docsAlex Gaynor2015-05-171-1/+1
|/ /
* | Merge pull request #43 from huanghao/patch-3Ben Bangert2015-03-301-2/+2
|\ \ | |/ |/| Fix typo in url() example
| * Fix typo in url() examplehuanghao2015-03-301-2/+2
|/ | | It should be "archives" rather than "blog"
* Update copyright.Ben Bangert2015-01-171-1/+1
|
* Add universal wheel. Update for rls.v2.1Ben Bangert2015-01-172-2/+5
|
* Add note regarding restful 405/404Ben Bangert2015-01-171-14/+21
|
* Add new printing docs.Ben Bangert2015-01-171-12/+14
|
* Update url to RTDBen Bangert2015-01-171-1/+1
|
* Update classifiersBen Bangert2015-01-171-1/+4
|
* * Fix 3 other route matching groups in route.py to use anonymous groups forBen Bangert2015-01-172-3/+5
| | | | optional sections to avoid exceeding regex limits. Fixes #15.
* * Printing a mapper now includes the Controller/action parameters from theBen Bangert2015-01-173-6/+9
| | | | route. Fixes #11.
* * Fix regression that didn't allow passing in params 'host', 'protocol', orBen Bangert2015-01-173-2/+19
| | | | | 'anchor'. They can now be passed in with a trailing '_' as was possible before commit d1d1742903fa5ca24ef848a6ae895303f2661b2a. Fixes #7.
* * URL generation with/without SCRIPT_NAME was resulting in the URL cacheBen Bangert2015-01-173-13/+24
| | | | | | failing to return the appropriate cached URL generation. The URL cache should always include the SCRIPT_NAME, even if its empty, in the cache to avoid this, and now does. Fixes #6.