From 12283b0836d765129d9f86a5149efe20f8bf8574 Mon Sep 17 00:00:00 2001 From: Arthur O'Dwyer Date: Mon, 17 Apr 2017 23:00:36 -0700 Subject: [PATCH] Move some harmless imports to file scope. NFC. --- copycat/correspondence.py | 2 +- copycat/group.py | 2 +- copycat/workspace.py | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/copycat/correspondence.py b/copycat/correspondence.py index d77b579..8c6b422 100644 --- a/copycat/correspondence.py +++ b/copycat/correspondence.py @@ -1,4 +1,5 @@ from conceptMapping import ConceptMapping +from group import Group from letter import Letter from workspaceStructure import WorkspaceStructure import formulas @@ -176,7 +177,6 @@ class Correspondence(WorkspaceStructure): for mapping in relevantMappings: if mapping.slippage(): self.accessoryConceptMappings += [mapping.symmetricVersion()] - from group import Group if isinstance(self.objectFromInitial, Group): if isinstance(self.objectFromTarget, Group): bondMappings = formulas.getMappings( diff --git a/copycat/group.py b/copycat/group.py index 6882636..fff7cc4 100644 --- a/copycat/group.py +++ b/copycat/group.py @@ -1,5 +1,6 @@ import logging +from description import Description from workspaceObject import WorkspaceObject import formulas @@ -40,7 +41,6 @@ class Group(WorkspaceObject): self.clampSalience = False self.name = '' - from description import Description # gross if self.bondList and len(self.bondList): firstFacet = self.bondList[0].facet self.addBondDescription( diff --git a/copycat/workspace.py b/copycat/workspace.py index 4f59402..d7209eb 100644 --- a/copycat/workspace.py +++ b/copycat/workspace.py @@ -1,6 +1,9 @@ import logging import formulas +from bond import Bond +from correspondence import Correspondence +from letter import Letter from workspaceString import WorkspaceString @@ -119,8 +122,6 @@ class Workspace(object): def numberOfUnreplacedObjects(self): """A list of all unreplaced objects in the inital string""" - from letter import Letter - objects = [o for o in self.objects if o.string == self.initial and isinstance(o, Letter)] objects = [o for o in objects if not o.replacement] @@ -135,13 +136,9 @@ class Workspace(object): def numberOfBonds(self): """The number of bonds in the workspace""" - from bond import Bond - return len([o for o in self.structures if isinstance(o, Bond)]) def correspondences(self): - from correspondence import Correspondence - return [s for s in self.structures if isinstance(s, Correspondence)] def slippages(self):