Change the default timeout to 5min

HISTORY.md

 ### Version History:
 
+- 1.6.3: Change default timeout to 5 minutes
 - 1.6.2: Properly handle (treat it as no error) error_code 31061 (file already exists) from PCS
 - 1.6.1: Ensure cache loading/saving failures won't affect normal operations; Fix the bug that clean up code not called on exit
 - 1.6.0: Fix 1000 items limit for remote directory listing

HISTORY.rst

 Version History:
 ~~~~~~~~~~~~~~~~
 
--  1.6.2: Properly handle (treat it as no error) error\_code 31061 (file
+-  1.6.3: Change default timeout to 5 minutes
+-  1.6.2: Properly handle (treat it as no error) error_code 31061 (file
    already exists) from PCS
--  1.6.1: Ensure cache loading/saving failures won't affect normal
+-  1.6.1: Ensure cache loading/saving failures won’t affect normal
    operations; Fix the bug that clean up code not called on exit
 -  1.6.0: Fix 1000 items limit for remote directory listing
 -  1.5.13: Fix multiprocess upload/syncup missing some files
--  1.5.12: Add one more heroku server; Workaround "ValueError: unknown
-   locale: UTF-8" on macOs (by xslidian)
+-  1.5.12: Add one more heroku server; Workaround “ValueError: unknown
+   locale: UTF-8” on macOs (by xslidian)
 -  1.5.11: Fix typo near version string
 -  1.5.10: Print the error code if the action failed
 -  1.5.9: Migrate the OpenShift auth server
@@ -17,39 +18,39 @@ Version History:
 -  1.5.7: Reduce multiprocess timeout to 49 days, to accommodate Python
    3 on Windows
 -  1.5.6: Downloading using downloader also retries
--  1.5.5: Minor: Improve 'multiprocess' installation prompts
--  1.5.4: Print instructions on how to fix 'multiprocess' errors
+-  1.5.5: Minor: Improve ‘multiprocess’ installation prompts
+-  1.5.4: Print instructions on how to fix ‘multiprocess’ errors
 -  1.5.3: Change to streaming upload
 -  1.5.2: Defuse the circular import bomb brought in the previous
-   version...
+   version…
 -  1.5.1: Improve multiprocess (and fix filter() for Python3)
 -  1.5.0: Multi-Process for directory download / upload / sync up/down
 
--  1.4.4: Aria2 download works even file names contain single quote (')
--  1.4.3: Fix \_\_server\_auth()
+-  1.4.4: Aria2 download works even file names contain single quote (’)
+-  1.4.3: Fix \__server_auth()
 -  1.4.2: Add bypy version in getting and refresshing token requests for
    finer control
 -  1.4.1: Fix a severe bug in token refreshing
 -  1.4.0: Correct Refresh server list; Add in update check
 
 -  1.3.9: Add in queue for capturing JSONs returned from PCS
--  1.3.8: Don't output Auth Server failures if no ``-d`` specified
+-  1.3.8: Don’t output Auth Server failures if no ``-d`` specified
 -  1.3.7: Allow passing leading dash arguments to downloader
 -  1.3.6: Fix downdir downloads to a wrong directory structure
 -  1.3.5: Fix aria2 unable to resume download
--  1.3.4: Add --select-fastest-mirror, --config-dir command line
+-  1.3.4: Add –select-fastest-mirror, –config-dir command line
    arguments; Switch to wheel dist format
 -  1.3.3: Fix the upload failure when slices expired
 -  1.3.2: Enable SSL check by default now
 -  1.3.1: Fix setup.py failures
 -  1.3.0: Major change: Make bypy a real Python package
 
--  1.2.22: Fix "TypeError: b'xxxxxx' is not JSON serializable" for cache
+-  1.2.22: Fix “TypeError: b’xxxxxx’ is not JSON serializable” for cache
 -  1.2.21: Support aria2 downloading resuming (disable preallocation)
 -  1.2.20: Fix an error in upload resuming; Add in retries for aria2
 -  1.2.19: Add in aria2 download support
 -  1.2.18: Add in upload resuming using slices; Fix Unicode issue with
-   py2\_jsondump(); Fix the pypi setup package
+   py2_jsondump(); Fix the pypi setup package
 -  1.2.17: Fix UnicodeEncodeError on redirect; Add in retry on urllib3
    TimeOutError
 -  1.2.16: Add in proxy prompts
@@ -59,11 +60,11 @@ Version History:
 -  1.2.13: Remove argcomplete; Improve encoding handling prompting
 -  1.2.12: Add in (optional) argcomplete
 -  1.2.11: Fix Exception in error dump introduced in 1.2.10
--  1.2.10: Handle (32, 'EPIPE'); Warn LOUDLY on encoding failures;
-   Remove 'is\_revision'
--  1.2.9: Fix formatex() Syntax Error; Handle (110, 'ETIMEDOUT')
--  1.2.8: Fix a Syntax Error; Handle {'error\_code': 0, 'error\_msg':
-   'no error'}
+-  1.2.10: Handle (32, ‘EPIPE’); Warn LOUDLY on encoding failures;
+   Remove ‘is_revision’
+-  1.2.9: Fix formatex() Syntax Error; Handle (110, ‘ETIMEDOUT’)
+-  1.2.8: Fix a Syntax Error; Handle {‘error_code’: 0, ‘error_msg’: ‘no
+   error’}
 -  1.2.7: Fix Hash Cache JSON saving (need to using string for Hashes)
 -  1.2.6: Fix Hash Cache JSON dumping (``Unicode`` again)
 -  1.2.5: Add in offline (cloud) download; Fix stack printing

bypy/bypy.py

@@ -288,7 +288,7 @@ class ByPy(object):
 		slice_size = const.DefaultSliceSize,
 		dl_chunk_size = const.DefaultDlChunkSize,
 		verify = True,
-		retry = 5, timeout = None,
+		retry = 5, timeout = const.DefaultTimeOutInSeconds,
 		quit_when_fail = False,
 		resumedownload = True,
 		extraupdate = lambda: (),
@@ -3453,7 +3453,7 @@ def getparser():
 		dest="quit", action="store_true",
 		help="quit when maximum number of retry failed [default: %(default)s]")
 	parser.add_argument("-t", "--timeout",
-		dest="timeout", default=None, type=float,
+		dest="timeout", default=const.DefaultTimeOutInSeconds, type=float,
 		help="network timeout in seconds [default: %(default)s]")
 	parser.add_argument("-s", "--slice",
 		dest="slice", default=const.DefaultSliceSize,

bypy/const.py

@@ -12,7 +12,7 @@ import os
 
 # https://packaging.python.org/single_source_version/
 __title__ = 'bypy'
-__version__ = '1.6.2'
+__version__ = '1.6.3'
 __author__ = 'Hou Tianze'
 __license__ = 'MIT'
 __desc__ = 'Python client for Baidu Yun (Personal Cloud Storage) 百度云/百度网盘 Python 客户端'
@@ -235,6 +235,7 @@ DefaultSliceSize = 20 * OneM
 DefaultDlChunkSize = 20 * OneM
 RetryDelayInSec = 10
 CacheSavePeriodInSec = 10 * 60.0
+DefaultTimeOutInSeconds=300
 # share retries
 ShareRapidUploadRetries = 3
 DefaultResumeDlRevertCount = 1

syncver.sh

@@ -2,4 +2,6 @@
 
 ver=`grep __version__ bypy/const.py | sed -e "s/__version__ *= *'//g" -e "s/'//g"`
 sed -i -e "s/\(^.*\)\"recommendedVersion\".*$/\1\"recommendedVersion\": \"$ver\",/g" update/update.json
+# mac sed fix
+rm -f update/update.json-e
 

update/update.json

 {
 	"comment": "Update info",
-	"recommendedVersion": "1.6.2",
+	"recommendedVersion": "1.6.3",
 	"minimumRequiredVersion": "1.6.0"
 }