summaryrefslogtreecommitdiff
path: root/paste
diff options
context:
space:
mode:
authorMarc Abramowitz <marc@marc-abramowitz.com>2015-04-30 07:27:52 -0700
committerMarc Abramowitz <marc@marc-abramowitz.com>2015-04-30 07:27:52 -0700
commit9d67cc2e257e998fc5b820675c1be22b083f35dc (patch)
tree9a691eac8505520484fd732e5a0ee475deacf92c /paste
parent1976ddda0db68e75bd4cf1bdd3f3eb0b3b99eee7 (diff)
downloadpaste-9d67cc2e257e998fc5b820675c1be22b083f35dc.tar.gz
Make get_headers default to Python 3; fallback to Python 2
as suggested by @haypo at https://bitbucket.org/ianb/paste/pull-request/22/fix-improper-commas-in-request-headers-in/diff#comment-6583636
Diffstat (limited to 'paste')
-rwxr-xr-xpaste/httpserver.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/paste/httpserver.py b/paste/httpserver.py
index 6172251..f1fe476 100755
--- a/paste/httpserver.py
+++ b/paste/httpserver.py
@@ -44,10 +44,10 @@ __version__ = "0.5"
def get_headers(headers, k):
- if hasattr(headers, 'getheaders'): # Python 2
- return headers.getheaders(k)
- if hasattr(headers, 'get_all'): # Python 3
- return headers.get_all(k)
+ if hasattr(headers, 'get_all'):
+ return headers.get_all(k) # Python 3
+ else:
+ return headers.getheaders(k) # Python 2
class ContinueHook(object):