Skip to content
This repository has been archived by the owner on Dec 14, 2021. It is now read-only.

Commit

Permalink
only using decode on str instances if the method is available
Browse files Browse the repository at this point in the history
- printing last update date on new line in about box
- fixed small crane.yaml error
  • Loading branch information
marcelhuberfoo committed Jun 1, 2016
1 parent fc9acf4 commit c8b165a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions OGRgeoConverter/tools/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ def execute(self):
if encoding is None:
encoding = 'utf-8'
if stdout is not None:
self.__result_output = stdout.decode(encoding)
self.__result_output = stdout.decode(encoding) if hasattr(stdout, 'decode') else stdout
if stderr is not None:
self.__result_error = stderr.decode(encoding)
self.__result_error = stderr.decode(encoding) if hasattr(stderr, 'decode') else stderr

def get_result_output(self):
return self.__result_output
Expand Down
2 changes: 1 addition & 1 deletion docker/crane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ containers:
- HONCHO_STARTFILE
- VIRTUAL_HOST
# - VIRTUAL_PORT
# - CERT_NAME\
# - CERT_NAME
- LETSENCRYPT_HOST
- LETSENCRYPT_EMAIL
- DJANGO_ADMIN_USER
Expand Down
3 changes: 2 additions & 1 deletion templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
<p>This is an online data converter for GIS vector file formats.<br>
It is based on the open source GDAL/OGR tools.</p>
<p>For more information please visit the <a href="http://giswiki.hsr.ch/GeoConverter" target="_blank">GISpunkt HSR Wiki</a></p>
<p><small>Version: {{ version_string }} Last updated: {{ last_update_date }}</small></p>
<p><small>Version: {{ version_string }}<br>
Last updated: {{ last_update_date }}</small></p>
</div>

<div id="terms-of-service-dialog" style="display:none;">
Expand Down

0 comments on commit c8b165a

Please sign in to comment.