3434 ni_measurementlink_service
3535 </ a >
3636 < div class ="version ">
37- 1.2.0-dev2
37+ 1.2.0-dev3
3838 </ div >
3939< div role ="search ">
4040 < form id ="rtd-search-form " class ="wy-form " action ="../../../search.html " method ="get ">
@@ -95,12 +95,10 @@ <h1>Source code for ni_measurementlink_service._internal.discovery_client</h1><d
9595< span class ="kn "> from</ span > < span class ="nn "> ni_measurementlink_service.measurement.info</ span > < span class ="kn "> import</ span > < span class ="n "> MeasurementInfo</ span > < span class ="p "> ,</ span > < span class ="n "> ServiceInfo</ span >
9696
9797< span class ="k "> if</ span > < span class ="n "> sys</ span > < span class ="o "> .</ span > < span class ="n "> platform</ span > < span class ="o "> ==</ span > < span class ="s2 "> "win32"</ span > < span class ="p "> :</ span >
98- < span class ="kn "> import</ span > < span class ="nn "> errno</ span >
9998 < span class ="kn "> import</ span > < span class ="nn "> msvcrt</ span >
10099
101100 < span class ="kn "> import</ span > < span class ="nn "> win32con</ span >
102101 < span class ="kn "> import</ span > < span class ="nn "> win32file</ span >
103- < span class ="kn "> import</ span > < span class ="nn "> winerror</ span >
104102
105103< span class ="n "> _logger</ span > < span class ="o "> =</ span > < span class ="n "> logging</ span > < span class ="o "> .</ span > < span class ="n "> getLogger</ span > < span class ="p "> (</ span > < span class ="vm "> __name__</ span > < span class ="p "> )</ span >
106104< span class ="c1 "> # Save Popen object to avoid "ResourceWarning: subprocess N is still running"</ span >
@@ -343,7 +341,7 @@ <h1>Source code for ni_measurementlink_service._internal.discovery_client</h1><d
343341 < span class ="n "> kwargs</ span > < span class ="p "> :</ span > < span class ="n "> Dict</ span > < span class ="p "> [</ span > < span class ="nb "> str</ span > < span class ="p "> ,</ span > < span class ="n "> Any</ span > < span class ="p "> ]</ span > < span class ="o "> =</ span > < span class ="p "> {}</ span >
344342 < span class ="k "> if</ span > < span class ="n "> sys</ span > < span class ="o "> .</ span > < span class ="n "> platform</ span > < span class ="o "> ==</ span > < span class ="s2 "> "win32"</ span > < span class ="p "> :</ span >
345343 < span class ="c1 "> # Terminating the measurement service should not terminate the discovery service.</ span >
346- < span class ="n "> kwargs</ span > < span class ="p "> [</ span > < span class ="s2 "> "creationflags"</ span > < span class ="p "> ]</ span > < span class ="o "> =</ span > < span class ="n "> subprocess</ span > < span class ="o "> .</ span > < span class ="n "> CREATE_BREAKAWAY_FROM_JOB</ span >
344+ < span class ="n "> kwargs</ span > < span class ="p "> [</ span > < span class ="s2 "> "creationflags"</ span > < span class ="p "> ]</ span > < span class ="o "> =</ span > < span class ="n "> subprocess</ span > < span class ="o "> .</ span > < span class ="n "> CREATE_BREAKAWAY_FROM_JOB</ span > < span class =" o " > | </ span > < span class =" n " > subprocess </ span > < span class =" o " > . </ span > < span class =" n " > DETACHED_PROCESS </ span >
347345 < span class ="n "> discovery_service_subprocess</ span > < span class ="o "> =</ span > < span class ="n "> subprocess</ span > < span class ="o "> .</ span > < span class ="n "> Popen</ span > < span class ="p "> (</ span >
348346 < span class ="p "> [</ span > < span class ="n "> exe_file_path</ span > < span class ="p "> ],</ span >
349347 < span class ="n "> cwd</ span > < span class ="o "> =</ span > < span class ="n "> exe_file_path</ span > < span class ="o "> .</ span > < span class ="n "> parent</ span > < span class ="p "> ,</ span >
@@ -358,7 +356,7 @@ <h1>Source code for ni_measurementlink_service._internal.discovery_client</h1><d
358356 < span class ="k "> try</ span > < span class ="p "> :</ span >
359357 < span class ="k "> with</ span > < span class ="n "> _open_key_file</ span > < span class ="p "> (</ span > < span class ="nb "> str</ span > < span class ="p "> (</ span > < span class ="n "> key_file_path</ span > < span class ="p "> ))</ span > < span class ="k "> as</ span > < span class ="n "> _</ span > < span class ="p "> :</ span >
360358 < span class ="k "> return</ span > < span class ="n "> discovery_service_subprocess</ span >
361- < span class ="k "> except</ span > < span class ="ne "> IOError </ span > < span class ="p "> :</ span >
359+ < span class ="k "> except</ span > < span class ="ne "> OSError </ span > < span class ="p "> :</ span >
362360 < span class ="k "> pass</ span >
363361 < span class ="k "> if</ span > < span class ="n "> time</ span > < span class ="o "> .</ span > < span class ="n "> time</ span > < span class ="p "> ()</ span > < span class ="o "> >=</ span > < span class ="n "> timeout_time</ span > < span class ="p "> :</ span >
364362 < span class ="k "> raise</ span > < span class ="ne "> TimeoutError</ span > < span class ="p "> (</ span > < span class ="s2 "> "Timed out waiting for discovery service to start"</ span > < span class ="p "> )</ span >
@@ -368,7 +366,7 @@ <h1>Source code for ni_measurementlink_service._internal.discovery_client</h1><d
368366< span class ="k "> def</ span > < span class ="nf "> _service_already_running</ span > < span class ="p "> (</ span > < span class ="n "> key_file_path</ span > < span class ="p "> :</ span > < span class ="n "> pathlib</ span > < span class ="o "> .</ span > < span class ="n "> Path</ span > < span class ="p "> )</ span > < span class ="o "> -></ span > < span class ="nb "> bool</ span > < span class ="p "> :</ span >
369367 < span class ="k "> try</ span > < span class ="p "> :</ span >
370368 < span class ="n "> _delete_existing_key_file</ span > < span class ="p "> (</ span > < span class ="n "> key_file_path</ span > < span class ="p "> )</ span >
371- < span class ="k "> except</ span > < span class ="ne "> IOError </ span > < span class ="p "> :</ span >
369+ < span class ="k "> except</ span > < span class ="ne "> OSError </ span > < span class ="p "> :</ span >
372370 < span class ="k "> return</ span > < span class ="kc "> True</ span >
373371 < span class ="k "> return</ span > < span class ="kc "> False</ span >
374372
@@ -419,14 +417,7 @@ <h1>Source code for ni_measurementlink_service._internal.discovery_client</h1><d
419417 < span class ="kc "> None</ span > < span class ="p "> ,</ span >
420418 < span class ="p "> )</ span >
421419 < span class ="k "> except</ span > < span class ="n "> win32file</ span > < span class ="o "> .</ span > < span class ="n "> error</ span > < span class ="k "> as</ span > < span class ="n "> e</ span > < span class ="p "> :</ span >
422- < span class ="k "> if</ span > < span class ="n "> e</ span > < span class ="o "> .</ span > < span class ="n "> winerror</ span > < span class ="o "> ==</ span > < span class ="n "> winerror</ span > < span class ="o "> .</ span > < span class ="n "> ERROR_FILE_NOT_FOUND</ span > < span class ="p "> :</ span >
423- < span class ="k "> raise</ span > < span class ="ne "> FileNotFoundError</ span > < span class ="p "> (</ span > < span class ="n "> errno</ span > < span class ="o "> .</ span > < span class ="n "> ENOENT</ span > < span class ="p "> ,</ span > < span class ="n "> e</ span > < span class ="o "> .</ span > < span class ="n "> strerror</ span > < span class ="p "> ,</ span > < span class ="n "> path</ span > < span class ="p "> )</ span > < span class ="kn "> from</ span > < span class ="nn "> e</ span >
424- < span class ="k "> elif</ span > < span class ="p "> (</ span >
425- < span class ="n "> e</ span > < span class ="o "> .</ span > < span class ="n "> winerror</ span > < span class ="o "> ==</ span > < span class ="n "> winerror</ span > < span class ="o "> .</ span > < span class ="n "> ERROR_ACCESS_DENIED</ span >
426- < span class ="ow "> or</ span > < span class ="n "> e</ span > < span class ="o "> .</ span > < span class ="n "> winerror</ span > < span class ="o "> ==</ span > < span class ="n "> winerror</ span > < span class ="o "> .</ span > < span class ="n "> ERROR_SHARING_VIOLATION</ span >
427- < span class ="p "> ):</ span >
428- < span class ="k "> raise</ span > < span class ="ne "> PermissionError</ span > < span class ="p "> (</ span > < span class ="n "> errno</ span > < span class ="o "> .</ span > < span class ="n "> EACCES</ span > < span class ="p "> ,</ span > < span class ="n "> e</ span > < span class ="o "> .</ span > < span class ="n "> strerror</ span > < span class ="p "> ,</ span > < span class ="n "> path</ span > < span class ="p "> )</ span > < span class ="kn "> from</ span > < span class ="nn "> e</ span >
429- < span class ="k "> raise</ span >
420+ < span class ="k "> raise</ span > < span class ="ne "> OSError</ span > < span class ="p "> (</ span > < span class ="kc "> None</ span > < span class ="p "> ,</ span > < span class ="n "> e</ span > < span class ="o "> .</ span > < span class ="n "> strerror</ span > < span class ="p "> ,</ span > < span class ="n "> path</ span > < span class ="p "> ,</ span > < span class ="n "> e</ span > < span class ="o "> .</ span > < span class ="n "> winerror</ span > < span class ="p "> )</ span > < span class ="kn "> from</ span > < span class ="nn "> e</ span >
430421
431422 < span class ="c1 "> # The CRT file descriptor takes ownership of the Win32 file handle.</ span >
432423 < span class ="c1 "> # os.O_TEXT is unnecessary because Python handles newline conversion.</ span >
0 commit comments