RDFread #7
Merged
RDFread #7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # CGRtools/files/RDFrw.py
stsouko
reviewed
Mar 20, 2019
CGRtools/files/RDFrw.py
Outdated
| super().__init__(*args, **kwargs) | ||
| super(CGRread, self).__init__(file) | ||
| self.__data = self.__reader() | ||
|
|
||
| if indexable and platform != 'win32': | ||
| self.__file = iter(self._file.readline, '') | ||
| if not self._is_buffer and next(self.__data): |
There was a problem hiding this comment.
вынеси проверку на буфер выше к остальным важным условиям
CGRtools/files/RDFrw.py
Outdated
| self.__file = iter(self._file.readline, '') | ||
| if not self._is_buffer and next(self.__data): | ||
| self.__shifts = [int(x.split(':', 1)[0]) | ||
| for x in check_output(["grep", "-bE", "\$[RM]FMT", self._file.name]).decode().split()] |
There was a problem hiding this comment.
твой сплит может сделать фигню. ибо пробелы в строчке бывают но есть способ. грепать онли паттерн
CGRtools/files/RDFrw.py
Outdated
| def __len__(self): | ||
| if self.__shifts: | ||
| return len(self.__shifts) - 1 | ||
| raise NotImplementedError(self.__error) |
There was a problem hiding this comment.
тогда уж сам класс ошибки вынеси. к чему полумеры
CGRtools/files/RDFrw.py
Outdated
| is_reaction = True | ||
| ir = 3 | ||
| meta = defaultdict(list) | ||
| else: | ||
| next(self._file) # skip header | ||
| if not self._is_buffer: # opened file is RXN or RDF |
There was a problem hiding this comment.
мы эту ошибку уже обсудили. исправь
CGRtools/files/RDFrw.py
Outdated
| next(self.__data) | ||
| if self.__shifts[0] != new_pos: | ||
| self._file.seek(new_pos) | ||
| elif 0 < current_pos < len(self.__shifts): |
There was a problem hiding this comment.
зачем так сложно проверять. проверил бы что оно не 0. и все.
CGRtools/files/RDFrw.py
Outdated
| self.__file = iter(self._file.readline, '') | ||
| self._file.seek(0) | ||
| next(self.__data) | ||
| if self.__shifts[0] != new_pos: |
CGRtools/files/RDFrw.py
Outdated
| if self.__shifts[0] != new_pos: | ||
| self._file.seek(new_pos) | ||
| elif 0 < current_pos < len(self.__shifts): | ||
| self.__data.send(new_pos) |
There was a problem hiding this comment.
сендить можно что угодно. так что шли просто трушку
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.