Skip to content

Commit

Permalink
3.6 back compatibility make me cry
Browse files Browse the repository at this point in the history
  • Loading branch information
stsouko committed Mar 16, 2021
1 parent 2a00dfd commit 3917b36
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
20 changes: 10 additions & 10 deletions CGRtools/algorithms/sssr.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,31 +225,31 @@ def __canonic_ring(ring: Tuple[int, ...]) -> Tuple[int, ...]:
ndx = ring.index(n)
if ndx == 0:
if ring[-1] < ring[1]:
return n, *ring[:0:-1]
return (n, *ring[:0:-1])
return ring
elif ndx == len(ring) - 1:
if ring[0] > ring[-2]:
return ring[::-1]
return n, *ring[:-1]
return (n, *ring[:-1])
if ring[ndx + 1] > ring[ndx - 1]:
return *ring[ndx::-1], *ring[:ndx:-1]
return *ring[ndx:], *ring[:ndx]
return (*ring[ndx::-1], *ring[:ndx:-1])
return (*ring[ndx:], *ring[:ndx])

@staticmethod
def __ring_scissors(ring: Tuple[int, ...], n: int, m: int) -> Tuple[int, ...]:
ndx = ring.index(n)
mdx = ring.index(m)
if ndx == 0:
if mdx == 1:
return n, *ring[:0:-1]
return (n, *ring[:0:-1])
return ring
elif ndx == len(ring) - 1:
if mdx == 0:
return ring[::-1]
return n, *ring[:-1]
return (n, *ring[:-1])
if ndx < mdx:
return *ring[ndx::-1], *ring[:ndx:-1]
return *ring[ndx:], *ring[:ndx]
return (*ring[ndx::-1], *ring[:ndx:-1])
return (*ring[ndx:], *ring[:ndx])

@staticmethod
def __ring_adjacency(ring: Tuple[int, ...]) -> Dict[int, List[int]]:
Expand Down Expand Up @@ -324,11 +324,11 @@ def __get_unique_chord(ring: Tuple[int, ...], common: Set[int]) -> Optional[Tupl
return ()
else:
if common == set(ring[:lc]):
return *ring[lc - 1:], ring[0]
return (*ring[lc - 1:], ring[0])
for _ in range(len(ring) - 1):
ring = (*ring[1:], ring[0])
if common == set(ring[:lc]):
return *ring[lc - 1:], ring[0]
return (*ring[lc - 1:], ring[0])

@classmethod
def __connected_rings(cls, rings, seen_rings):
Expand Down
6 changes: 3 additions & 3 deletions CGRtools/algorithms/standardize.py
Original file line number Diff line number Diff line change
Expand Up @@ -1621,9 +1621,9 @@ def explicify_hydrogens(self: 'ReactionContainer') -> int:
for m in self.molecules():
if not isinstance(m, Standardize):
raise TypeError('Only Molecules supported')
map = max(m, default=0)
if map > start_map:
start_map = map
map_ = max(m, default=0)
if map_ > start_map:
start_map = map_

mapping = defaultdict(list)
for m in self.reactants:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def finalize_options(self):
license='LGPLv3',
author='Dr. Ramil Nugmanov',
author_email='nougmanoff@protonmail.com',
python_requires='>=3.7.1',
python_requires='>=3.6.1',
cmdclass=cmd_class,
install_requires=['CachedMethods>=0.1.4,<0.2'],
extras_require={'mrv': ['lxml>=4.1'], 'clean2d': ['py-mini-racer>=0.4.0'], 'jit': ['numpy>=1.18', 'numba>=0.50']},
Expand Down

0 comments on commit 3917b36

Please sign in to comment.