yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-05 02:29:28 +02:00
Code Issues Releases Wiki Activity

tox.ini and py35 support, fix linting errors

Browse source
This commit is contained in:
holger krekel 2018-09-07 18:30:39 +02:00
parent c24c21f890
commit 940f665b54
6 changed files with 59 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
python/src/deltachat/account.py
View file

@ -3,10 +3,10 @@ import threading
import requests
from . import capi
import deltachat
from .capi import ffi
def eventprinter((evt_name, data1, data2)):
def eventprinter(evt):
evt_name, data1, data2 = evt
t = threading.currentThread()
tname = getattr(t, "name", t)
print("[" + tname + "]", evt_name, data1, data2)
@ -25,11 +25,10 @@ class EventHandler:
return r.content
def dc_event_http_get(self, data1, data2):
url = data1.decode("utf-8")
content = self.read_url(url)
s = content.encode("utf-8")
url = data1
content = self.read_url(url)
# we need to return a fresh pointer that the core owns
return capi.lib.dupstring_helper(s)
return capi.lib.dupstring_helper(content)
def dc_event_is_offline(self, data1, data2):
return 0 # always online
@ -40,6 +39,8 @@ class Account:
self.dc_context = ctx = capi.lib.dc_context_new(
capi.lib.py_dc_callback,
capi.ffi.NULL, capi.ffi.NULL)
if hasattr(db_path, "encode"):
db_path = db_path.encode("utf8")
capi.lib.dc_open(ctx, db_path, capi.ffi.NULL)
self._logcallback = logcallback or (lambda *args: None)
if eventhandler is None:
@ -48,6 +49,8 @@ class Account:
def set_config(self, **kwargs):
for name, value in kwargs.items():
name = name.encode("utf8")
value = value.encode("utf8")
capi.lib.dc_set_config(self.dc_context, name, value)
def start(self):
@ -75,7 +78,6 @@ class Account:
return 0
class IOThreads:
def __init__(self, dc_context):
self.dc_context = dc_context