424 if codestring: |
424 if codestring: |
425 self.source = Utilities.normalizeCode(codestring) |
425 self.source = Utilities.normalizeCode(codestring) |
426 else: |
426 else: |
427 try: |
427 try: |
428 if FileSystemUtilities.isRemoteFileName(self.filename): |
428 if FileSystemUtilities.isRemoteFileName(self.filename): |
429 bSource = self.__remotefsInterface.readFile( |
429 self.source = self.__remotefsInterface.readEncodedFile( |
430 FileSystemUtilities.plainFileName(self.filename) |
430 self.filename |
431 ) |
431 )[0] |
432 self.source = Utilities.decode(bSource)[0] |
|
433 else: |
432 else: |
434 self.source = Utilities.readEncodedFile(self.filename)[0] |
433 self.source = Utilities.readEncodedFile(self.filename)[0] |
435 self.source = Utilities.normalizeCode(self.source) |
434 self.source = Utilities.normalizeCode(self.source) |
436 except (OSError, UnicodeError) as msg: |
435 except (OSError, UnicodeError) as msg: |
437 self.noResults = False |
436 self.noResults = False |
467 QApplication.processEvents() |
466 QApplication.processEvents() |
468 self.__timenow = time.monotonic() |
467 self.__timenow = time.monotonic() |
469 |
468 |
470 try: |
469 try: |
471 if FileSystemUtilities.isRemoteFileName(self.filename): |
470 if FileSystemUtilities.isRemoteFileName(self.filename): |
472 bSource = self.__remotefsInterface.readFile( |
471 source = self.__remotefsInterface.readEncodedFile( |
473 FileSystemUtilities.plainFileName(self.filename) |
472 self.filename |
474 ) |
473 )[0] |
475 source = Utilities.decode(bSource)[0] |
|
476 else: |
474 else: |
477 source = Utilities.readEncodedFile(filename)[0] |
475 source = Utilities.readEncodedFile(filename)[0] |
478 source = Utilities.normalizeCode(source) |
476 source = Utilities.normalizeCode(source) |
479 except (OSError, UnicodeError) as msg: |
477 except (OSError, UnicodeError) as msg: |
480 self.noResults = False |
478 self.noResults = False |