diff options
| author | Bruno Wagner Goncalves <bwagner@thoughtworks.com> | 2014-08-06 01:47:33 -0300 |
|---|---|---|
| committer | Bruno Wagner Goncalves <bwagner@thoughtworks.com> | 2014-08-06 01:47:33 -0300 |
| commit | 821c1a76d80c0259e10e66443eb458f14d840b85 (patch) | |
| tree | 42d2f2ff8c800a99cff996dff5801027398d03bf /service/app | |
| parent | d424cc0d9cf3602641b6285a593e24da2d3e177e (diff) | |
Found a home for the 'insert base path in python path' hack and fixed some style issues
Diffstat (limited to 'service/app')
| -rw-r--r-- | service/app/__init__.py | 4 | ||||
| -rw-r--r-- | service/app/bitmask_libraries/smtp.py | 12 | ||||
| -rw-r--r-- | service/app/pixelated_user_agent.py | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/service/app/__init__.py b/service/app/__init__.py index e69de29b..acb5b492 100644 --- a/service/app/__init__.py +++ b/service/app/__init__.py @@ -0,0 +1,4 @@ +import sys +import os + +sys.path.insert(0, os.environ['APP_ROOT']) diff --git a/service/app/bitmask_libraries/smtp.py b/service/app/bitmask_libraries/smtp.py index 0315b40a..5fa7ad70 100644 --- a/service/app/bitmask_libraries/smtp.py +++ b/service/app/bitmask_libraries/smtp.py @@ -37,7 +37,7 @@ class LeapSmtp(object): session = requests.session() cert_url = '%s/%s/cert' % (self._provider.api_uri, self._provider.api_version) - cookies = { "_session_id": self._srp_session.session_id } + cookies = {"_session_id": self._srp_session.session_id} response = requests.get(cert_url, verify=which_bundle(self._provider), cookies=cookies, timeout=self._provider.config.timeout_in_s) response.raise_for_status() @@ -48,10 +48,11 @@ class LeapSmtp(object): f.write(client_cert) def _client_cert_path(self): - return os.path.join(self._provider.config.leap_home, - "providers", - self._provider.domain, - "keys", "client", "smtp.pem") + return os.path.join( + self._provider.config.leap_home, + "providers", + self._provider.domain, + "keys", "client", "smtp.pem") def start(self): self._download_client_certificates() @@ -74,4 +75,3 @@ class LeapSmtp(object): self._smtp_service.doStop() self._smtp_port = None self._smtp_service = None - diff --git a/service/app/pixelated_user_agent.py b/service/app/pixelated_user_agent.py index ff20413f..bdfcc336 100644 --- a/service/app/pixelated_user_agent.py +++ b/service/app/pixelated_user_agent.py @@ -1,11 +1,7 @@ -import sys -import os import json import datetime import requests -sys.path.insert(0, os.environ['APP_ROOT']) - from flask import Flask, request, Response from search import SearchQuery from adapter.mail_service import MailService |