[Pkg-bitcoin-commits] [python-quamash] 130/269: merged

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository python-quamash.

commit 3b0a161a01aa6b55003627a937ccf109b51a956a
Merge: a24e4ab bbf9f83
Author: Mark Harviston <mark.harviston at gmail.com>
Date:   Mon Nov 24 15:40:40 2014 -0800

    merged

 .travis.yml              |  2 +-
 conftest.py              |  5 ++++-
 quamash/__init__.py      | 23 ++++++++++++-----------
 tests/test_qeventloop.py |  4 +---
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --cc conftest.py
index 75509de,6f26048..2fdf020
--- a/conftest.py
+++ b/conftest.py
@@@ -5,4 -5,7 +5,7 @@@ sys.path.insert(0, os.path.dirname(__fi
  logging.basicConfig(
  	level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(name)s - %(message)s')
  
- 
+ if os.name == 'nt':
 -    collect_ignore = ['quamash/_unix.py']
++	collect_ignore = ['quamash/_unix.py']
+ else:
 -    collect_ignore = ['quamash/_windows.py']
++	collect_ignore = ['quamash/_windows.py']
diff --cc tests/test_qeventloop.py
index 542a0e6,f6ba8af..d2d3df8
--- a/tests/test_qeventloop.py
+++ b/tests/test_qeventloop.py
@@@ -8,10 -8,7 +8,8 @@@ import sy
  import ctypes
  import multiprocessing
  from concurrent.futures import ThreadPoolExecutor, ProcessPoolExecutor
 +import socket
  
- from quamash import QtCore, QtGui
- 
  import quamash
  
  import pytest

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/python-quamash.git