diff options
| author | Ben Bangert <ben@groovie.org> | 2016-02-13 08:48:19 -0800 |
|---|---|---|
| committer | Ben Bangert <ben@groovie.org> | 2016-02-13 08:48:19 -0800 |
| commit | 214d020970ad0b4012f3de5136f633c70a7a0220 (patch) | |
| tree | eae580667eb7fca455f6b219d8e462dd558b052f | |
| parent | e336dc26b9a6b56b2c7492345fc456c6a31dbd80 (diff) | |
| parent | 6ce605545a324b8a6724b6bed24b6e59ef1e5c27 (diff) | |
| download | routes-214d020970ad0b4012f3de5136f633c70a7a0220.tar.gz | |
Merge pull request #56 from haypo/mapper_py3
Fix BytesWarning in Mapper.generate()
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | routes/mapper.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index e7788ce..2f9b500 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,4 +14,4 @@ matrix: install: - python setup.py develop - pip install webob webtest coverage -script: nosetests +script: python -bb $(which nosetests) diff --git a/routes/mapper.py b/routes/mapper.py index 43372d7..06f09f2 100644 --- a/routes/mapper.py +++ b/routes/mapper.py @@ -789,7 +789,11 @@ class Mapper(SubMapperParent): six.text_type(kargs).encode('utf8') if self.urlcache is not None: - cache_key_script_name = '%s:%s' % (script_name, cache_key) + if six.PY3: + cache_key_script_name = b':'.join((script_name.encode('utf-8'), + cache_key)) + else: + cache_key_script_name = '%s:%s' % (script_name, cache_key) # Check the url cache to see if it exists, use it if it does val = self.urlcache.get(cache_key_script_name, self) |