Skip to content
Snippets Groups Projects
Commit 8f225523 authored by Jonas Haag's avatar Jonas Haag
Browse files

Python 2.6 support. Thanks to Steve Romanow (@slestak) for the patch.

parent de427065
No related branches found
No related tags found
No related merge requests found
......@@ -32,7 +32,7 @@ except IOError:
def query_string_to_dict(query_string):
""" Transforms a POST/GET string into a Python dict """
return {k: v[0] for k, v in urlparse.parse_qs(query_string).iteritems()}
return dict((k, v[0]) for k, v in urlparse.parse_qs(query_string).iteritems())
class KlausApplication(NanoApplication):
def __init__(self, *args, **kwargs):
......@@ -74,8 +74,10 @@ class KlausApplication(NanoApplication):
app = application = KlausApplication(debug=True, default_content_type='text/html')
# KLAUS_REPOS=/foo/bar/,/spam/ --> {'bar': '/foo/bar/', 'spam': '/spam/'}
app.repos = {repo.rstrip(os.sep).split(os.sep)[-1]: repo for repo in
sys.argv[1:] or os.environ.get('KLAUS_REPOS', '').split()}
app.repos = dict(
(repo.rstrip(os.sep).split(os.sep)[-1], repo)
for repo in (sys.argv[1:] or os.environ.get('KLAUS_REPOS', '').split())
)
def pygmentize(code, filename=None, language=None):
if language:
......
......@@ -81,7 +81,10 @@ class RepoWrapper(dulwich.repo.Repo):
if path:
cmd.extend(['--', path])
sha1_sums = subprocess.check_output(cmd, cwd=os.path.abspath(self.path))
# sha1_sums = subprocess.check_output(cmd, cwd=os.path.abspath(self.path))
# Can't use 'check_output' for Python 2.6 compatibility reasons
sha1_sums = subprocess.Popen(cmd, cwd=os.path.abspath(self.path),
stdout=subprocess.PIPE).communicate()[0]
return [self[sha1] for sha1 in sha1_sums.strip().split('\n')]
#
# if not isinstance(commit, dulwich.objects.Commit):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment