Skip to content

Commit

Permalink
Merge #120
Browse files Browse the repository at this point in the history
120: TCPIP INSTR Session / RPC timeout handling improvements r=MatthieuDartiailh a=skrchnavy

* `rpc` module changes:
  * updated to use timeout and fragmentation size in recv and write operations
  * fragmentation support in write operation
  * connect is timeouted based on timeout
  * 'select' moved to `_sendrecord` and `_recvrecord` functions
* `tcpip` module:
 * open_timeout passed to rpc via vxi11

Related to #88
  • Loading branch information
bors[bot] committed Feb 27, 2018
2 parents e91ce7c + b1d0c51 commit 65231e3
Show file tree
Hide file tree
Showing 9 changed files with 367 additions and 196 deletions.
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,17 @@ branches:
- master

python:
- "2.6"
- "2.7"
- "3.2"
- "3.3"
- "3.4"
- "3.5"
- "3.6"

install:
- if [ $TRAVIS_PYTHON_VERSION == '2.6' ]; then pip install unittest2; fi
- if [ $TRAVIS_PYTHON_VERSION == '3.2' ]; then pip install coverage==3.7.1; else pip install coverage; fi
- pip install coverage
- pip install coveralls

script:
- if [ $TRAVIS_PYTHON_VERSION == '2.6' ]; then coverage run -p --source=pyvisa-py --omit="*test*" setup.py test; fi
- if [ $TRAVIS_PYTHON_VERSION != '2.6' ]; then python -bb -m coverage run -p --source=pyvisa-py --omit="*test*" setup.py test; fi
- python -bb -m coverage run -p --source=pyvisa-py --omit="*test*" setup.py test
- coverage combine
- coverage report -m

Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Python has a couple of features that make it very interesting for measurement co
Requirements
------------

- Python (tested with 2.6 and 2.7, 3.2+)
- Python (tested with 2.7, 3.4+)
- PyVISA 1.6+

Optionally
Expand Down
3 changes: 2 additions & 1 deletion pyvisa-py/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
:license: MIT, see LICENSE for more details.
"""

from __future__ import division, unicode_literals, print_function, absolute_import
from __future__ import (division, unicode_literals, print_function,
absolute_import)

import logging
import sys
Expand Down
Loading

0 comments on commit 65231e3

Please sign in to comment.