summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph <c@kluenter.de>2016-03-24 16:28:01 +0100
committerChristoph <c@kluenter.de>2016-03-24 16:28:01 +0100
commit28341464bf5dd3d9a2600a2cf8a08ee411cf848c (patch)
tree3f64b4f6d963c19fb6aabc000e6d15ae332e8384
parente1211fc4fcfbad96be8692a1d375cf10c9157ee5 (diff)
parent852a496c60e0524e9b0b37bc9b9a08da41d1ee61 (diff)
Merge pull request #662 from kalikaneko/fix/remove-pycryptopp
[fix] remove pycryptopp dependency
-rw-r--r--service/pixelated/adapter/model/mail.py4
-rw-r--r--service/requirements.txt1
2 files changed, 2 insertions, 3 deletions
diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py
index 76df076e..a24818c0 100644
--- a/service/pixelated/adapter/model/mail.py
+++ b/service/pixelated/adapter/model/mail.py
@@ -19,11 +19,11 @@ import logging
from email import message_from_file
from email.mime.text import MIMEText
from email.header import Header
+from hashlib import sha256
import binascii
from email.MIMEMultipart import MIMEMultipart
from email.mime.nonmultipart import MIMENonMultipart
-from pycryptopp.hash import sha256
import leap.mail.walk as walk
from pixelated.adapter.model.status import Status
from pixelated.support import date
@@ -137,7 +137,7 @@ class Mail(object):
return self._mime_multipart.as_string()
def _get_chash(self):
- return sha256.SHA256(self.raw).hexdigest()
+ return sha256(self.raw).hexdigest()
class InputMail(Mail):
diff --git a/service/requirements.txt b/service/requirements.txt
index b74b7f94..48d55ac2 100644
--- a/service/requirements.txt
+++ b/service/requirements.txt
@@ -7,7 +7,6 @@ pyasn1==0.1.8
requests==2.9.1
srp==1.0.4
whoosh==2.5.7
-pycryptopp
-e 'git+https://github.com/pixelated/leap_pycommon.git@develop#egg=leap.common'
-e 'git+https://github.com/pixelated/leap_auth.git#egg=leap.auth'
-e 'git+https://github.com/pixelated/soledad.git@develop#egg=leap.soledad.common&subdirectory=common/'