diff --git a/ci_scripts/run_all.sh b/ci_scripts/run_all.sh index 59384eb42..da8cf9c4c 100755 --- a/ci_scripts/run_all.sh +++ b/ci_scripts/run_all.sh @@ -37,7 +37,7 @@ if [ -n "$TESTS" ]; then export PYTHONDONTWRITEBYTECODE=1 # run tox - tox --workdir "$TOXWORKDIR" -e py27,py35,py36,py37,auditwheels + tox --workdir "$TOXWORKDIR" -e lint,py27,py35,py36,py37,auditwheels popd fi diff --git a/python/src/deltachat/__init__.py b/python/src/deltachat/__init__.py index bb1d482fc..7ad9d6052 100644 --- a/python/src/deltachat/__init__.py +++ b/python/src/deltachat/__init__.py @@ -2,7 +2,7 @@ from deltachat import capi, const from deltachat.capi import ffi from deltachat.account import Account # noqa -__version__ = "0.10.0.dev2" +__version__ = "0.10.0.dev3" _DC_CALLBACK_MAP = {} diff --git a/python/src/deltachat/account.py b/python/src/deltachat/account.py index ddffcdfc1..9025cee14 100644 --- a/python/src/deltachat/account.py +++ b/python/src/deltachat/account.py @@ -285,14 +285,14 @@ class Account(object): """return after all delta chat state is exported to a new file in the specified directory. """ - l = os.listdir(backupdir) + snap_files = os.listdir(backupdir) self._imex_completed.clear() lib.dc_imex(self._dc_context, 11, as_dc_charpointer(backupdir), ffi.NULL) if not self._threads.is_started(): lib.dc_perform_imap_jobs(self._dc_context) self._imex_completed.wait() for x in os.listdir(backupdir): - if x not in l: + if x not in snap_files: return os.path.join(backupdir, x) def import_from_file(self, path): @@ -370,14 +370,14 @@ class IOThreads: thread.join() def imap_thread_run(self): - print ("starting imap thread") + print("starting imap thread") while not self._thread_quitflag: lib.dc_perform_imap_jobs(self._dc_context) lib.dc_perform_imap_fetch(self._dc_context) lib.dc_perform_imap_idle(self._dc_context) def smtp_thread_run(self): - print ("starting smtp thread") + print("starting smtp thread") while not self._thread_quitflag: lib.dc_perform_smtp_jobs(self._dc_context) lib.dc_perform_smtp_idle(self._dc_context) diff --git a/python/tests/test_account.py b/python/tests/test_account.py index e35fbe4f5..211e79401 100644 --- a/python/tests/test_account.py +++ b/python/tests/test_account.py @@ -234,9 +234,9 @@ class TestOfflineAccount: assert os.path.exists(path) ac2 = acfactory.get_unconfigured_account() ac2.import_from_file(path) - l = ac2.get_contacts(query="some1") - assert len(l) == 1 - contact2 = l[0] + contacts = ac2.get_contacts(query="some1") + assert len(contacts) == 1 + contact2 = contacts[0] assert contact2.addr == "some1@hello.com" chat2 = ac2.create_chat_by_contact(contact2) messages = chat2.get_messages() @@ -270,9 +270,9 @@ class TestOnlineAccount: c2 = ac1.create_contact(email=ac2.get_config("addr")) chat = ac1.create_chat_by_contact(c2) assert chat.id >= const.DC_CHAT_ID_LAST_SPECIAL - #wait_successful_IMAP_SMTP_connection(ac1) + wait_successful_IMAP_SMTP_connection(ac1) wait_configuration_progress(ac1, 1000) - #wait_successful_IMAP_SMTP_connection(ac2) + wait_successful_IMAP_SMTP_connection(ac2) wait_configuration_progress(ac2, 1000) msg_out = chat.send_text("message1") diff --git a/python/tox.ini b/python/tox.ini index a07d18eb5..8405deb4e 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -27,7 +27,7 @@ commands = [testenv:lint] skipsdist = True usedevelop = True -basepython = python2.7 +basepython = python3.5 deps = flake8 # pygments required by rst-lint