Fix python3 / kivy test #2262
|
@ -7,6 +7,8 @@ import shutil
|
||||||
import tempfile
|
import tempfile
|
||||||
from time import time, sleep
|
from time import time, sleep
|
||||||
|
|
||||||
|
from requests.exceptions import ChunkedEncodingError
|
||||||
|
|
||||||
from telenium.tests import TeleniumTestCase
|
from telenium.tests import TeleniumTestCase
|
||||||
from telenium.client import TeleniumHttpException
|
from telenium.client import TeleniumHttpException
|
||||||
|
|
||||||
|
@ -54,7 +56,10 @@ class TeleniumTestProcess(TeleniumTestCase):
|
||||||
def tearDownClass(cls):
|
def tearDownClass(cls):
|
||||||
"""Ensures that pybitmessage stopped and removes files"""
|
"""Ensures that pybitmessage stopped and removes files"""
|
||||||
# pylint: disable=no-member
|
# pylint: disable=no-member
|
||||||
|
try:
|
||||||
super(TeleniumTestProcess, cls).tearDownClass()
|
super(TeleniumTestProcess, cls).tearDownClass()
|
||||||
|
except ChunkedEncodingError:
|
||||||
|
pass
|
||||||
cleanup()
|
cleanup()
|
||||||
|
|
||||||
def assert_wait_no_except(self, selector, timeout=-1, value='inbox'):
|
def assert_wait_no_except(self, selector, timeout=-1, value='inbox'):
|
||||||
|
|
|
@ -11,11 +11,17 @@ import hashlib
|
||||||
import os
|
import os
|
||||||
from binascii import hexlify
|
from binascii import hexlify
|
||||||
|
|
||||||
|
try:
|
||||||
import pyelliptic
|
import pyelliptic
|
||||||
|
from fallback import RIPEMD160Hash
|
||||||
from pyelliptic import OpenSSL
|
from pyelliptic import OpenSSL
|
||||||
from pyelliptic import arithmetic as a
|
from pyelliptic import arithmetic as a
|
||||||
|
except ImportError:
|
||||||
|
from pybitmessage import pyelliptic
|
||||||
|
from pybitmessage.fallback import RIPEMD160Hash
|
||||||
|
from pybitmessage.pyelliptic import OpenSSL
|
||||||
|
from pybitmessage.pyelliptic import arithmetic as a
|
||||||
|
|
||||||
from fallback import RIPEMD160Hash
|
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
'decodeWalletImportFormat', 'deterministic_keys',
|
'decodeWalletImportFormat', 'deterministic_keys',
|
||||||
|
|
Reference in New Issue
Block a user