takino
/
ordigi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gh-82 Fix notifications from flake8 and add mock module to requirements.txt

This commit is contained in:
Jaisen Mathai 2016-02-11 15:24:42 -08:00
parent 0d154d67c9
commit 5204253ad2
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elodie/constants.py
View File

@ -20,7 +20,7 @@ location_db = '{}/location.json'.format(application_directory)
script_directory = path.dirname(path.dirname(path.abspath(__file__))) script_directory = path.dirname(path.dirname(path.abspath(__file__)))
#: Path to Elodie's ExifTool config file. #: Path to Elodie's ExifTool config file.
exiftool_config = path.join(script_directory,'configs','ExifTool_config') exiftool_config = path.join(script_directory, 'configs', 'ExifTool_config')
#: Accepted language in responses from MapQuest #: Accepted language in responses from MapQuest
accepted_language = 'en' accepted_language = 'en'

2
elodie/geolocation.py
View File

@ -164,7 +164,7 @@ def reverse_lookup(lat, lon):
headers = {"Accept-Language": constants.accepted_language} headers = {"Accept-Language": constants.accepted_language}
r = requests.get( r = requests.get(
'http://open.mapquestapi.com/nominatim/v1/reverse.php?%s' % 'http://open.mapquestapi.com/nominatim/v1/reverse.php?%s' %
urllib.urlencode(params),headers=headers urllib.urlencode(params), headers=headers
) )
return r.json() return r.json()
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:

2
elodie/media/media.py
View File

@ -226,7 +226,7 @@ class Media(object):
print '%s -config "%s" -xmp-elodie:Album="%s" "%s"' % (exiftool, exiftool_config, name, source) # noqa print '%s -config "%s" -xmp-elodie:Album="%s" "%s"' % (exiftool, exiftool_config, name, source) # noqa
process_output = subprocess.Popen( process_output = subprocess.Popen(
'%s -config "%s" -xmp-elodie:Album="%s" "%s"' % '%s -config "%s" -xmp-elodie:Album="%s" "%s"' %
(exiftool, exiftool_config, name, source), (exiftool, exiftool_config, name, source),
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
shell=True shell=True
) )

1
requirements.txt
View File

@ -2,3 +2,4 @@ click>=6.2,<7.0
LatLon>=1.0.2,<2.0 LatLon>=1.0.2,<2.0
requests>=2.9.1,<3.0 requests>=2.9.1,<3.0
send2trash>=1.3.0,<2.0 send2trash>=1.3.0,<2.0
mock>=1.3.0