Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2.69.3
* Fixed chunked downloads
2.69.2
* Added method to list devices from device groups
2.69.1
* Added warning about deprecated methods
* Upload returns as json
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sys, os


version = '2.69.1'
version = '2.69.3'

setup(name='testdroid',
version=version,
Expand Down
12 changes: 8 additions & 4 deletions testdroid/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from optparse import OptionParser
from datetime import datetime

__version__ = '2.69.1'
__version__ = '2.69.3'

FORMAT = "%(message)s"
logging.basicConfig(format=FORMAT)
Expand Down Expand Up @@ -199,10 +199,14 @@ def download(self, path=None, filename=None, payload={}, callback=None):
res = requests.get(url, params=payload, headers=self._build_headers(), stream=True, timeout=(60.0))

if res.status_code in range(200, 300):
logger.info("Downloading %s (%s bytes)" % (filename, res.headers["Content-Length"]))
pos = 0
total = res.headers['content-length']
try:
total = res.headers['Content-length']
logger.info("Downloading %s (%s bytes)" % (filename, total))
except KeyError as e:
callback = None

pos = 0

# Check if the system is Windows or not.
if os.name == 'nt':
fd = os.open(filename, os.O_RDWR|os.O_CREAT|os.O_BINARY)
Expand Down