Added bzr to pip-requires and refixed some pep8 stuff

This commit is contained in:
Cerberus 2011-01-25 00:17:38 -06:00
parent 7bc9ed564c
commit 8f4078821d
2 changed files with 5 additions and 0 deletions

View File

@ -21,6 +21,7 @@ A few utility routines used throughout Glance
import os
def image_meta_to_http_headers(image_meta):
"""
Returns a set of image metadata into a dict
@ -85,6 +86,7 @@ def get_image_meta_from_headers(response):
result['properties'] = properties
return result
def parse_mailmap(mailmap='.mailmap'):
mapping = {}
if os.path.exists(mailmap):
@ -96,11 +98,13 @@ def parse_mailmap(mailmap='.mailmap'):
mapping[alias] = canonical_email
return mapping
def str_dict_replace(s, mapping):
for s1, s2 in mapping.iteritems():
s = s.replace(s1, s2)
return s
def has_body(req):
"""
Returns whether a Webob.Request object will possess an entity body.

View File

@ -7,6 +7,7 @@ eventlet>=0.9.12
lockfile==0.8
python-daemon==1.5.5
python-gflags>=1.3
bzr
routes
webob
wsgiref