summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--service/pixelated/adapter/soledad/soledad_writer_mixin.py1
-rw-r--r--service/pixelated/bitmask_libraries/session.py1
-rw-r--r--service/pixelated/bitmask_libraries/smtp.py3
-rw-r--r--service/pixelated/support/ext_protobuf.py2
4 files changed, 2 insertions, 5 deletions
diff --git a/service/pixelated/adapter/soledad/soledad_writer_mixin.py b/service/pixelated/adapter/soledad/soledad_writer_mixin.py
index 869f7c07..c95c7b57 100644
--- a/service/pixelated/adapter/soledad/soledad_writer_mixin.py
+++ b/service/pixelated/adapter/soledad/soledad_writer_mixin.py
@@ -13,7 +13,6 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-from pixelated.adapter.model.mail import PixelatedMail
from pixelated.adapter.soledad.soledad_facade_mixin import SoledadDbFacadeMixin
diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py
index 9f21fbe6..b23d964f 100644
--- a/service/pixelated/bitmask_libraries/session.py
+++ b/service/pixelated/bitmask_libraries/session.py
@@ -14,7 +14,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
import errno
-import logging
import traceback
import sys
diff --git a/service/pixelated/bitmask_libraries/smtp.py b/service/pixelated/bitmask_libraries/smtp.py
index d5236e8e..d4f68f94 100644
--- a/service/pixelated/bitmask_libraries/smtp.py
+++ b/service/pixelated/bitmask_libraries/smtp.py
@@ -55,7 +55,6 @@ class LeapSmtp(object):
if not os.path.exists(os.path.dirname(cert_path)):
os.makedirs(os.path.dirname(cert_path))
- session = requests.session()
cert_url = '%s/%s/cert' % (self._provider.api_uri, self._provider.api_version)
cookies = {"_session_id": self._srp_session.session_id}
@@ -94,7 +93,7 @@ class LeapSmtp(object):
if not self._smtp_service:
try:
self.start()
- except Exception as e:
+ except:
logger.warning("Couldn't start the SMTP server now, will try again when the user tries to use it")
return False
return True
diff --git a/service/pixelated/support/ext_protobuf.py b/service/pixelated/support/ext_protobuf.py
index 1d6fc5fc..548f5fd6 100644
--- a/service/pixelated/support/ext_protobuf.py
+++ b/service/pixelated/support/ext_protobuf.py
@@ -28,7 +28,7 @@ if _platform == 'darwin':
try:
func(*args, **kwargs)
pass
- except Exception as e:
+ except:
pass
return wrapper