Reordering operations to avoid unnecessary work

Author: mwatts15

PyOpenWorm/cell.py

@@ -108,15 +108,6 @@ class Cell(BiologyType):
                                 inverse_of=(This, 'parentOf'))
     parentOf = ObjectProperty(value_type=This, multiple=True)
 
-    def __init__(self, name=False, lineageName=False, **kwargs):
-        super(Cell, self).__init__(**kwargs)
-
-        if name:
-            self.name(name)
-
-        if lineageName:
-            self.lineageName(lineageName)
-
     def _morphology(self):
         """Return the morphology of the cell. Currently this is restricted to
            `Neuron <#neuron>`_ objects.

PyOpenWorm/document.py

@@ -109,14 +109,13 @@ def __init__(
             An ID or URL from WormBase that points to a record. Ignored if `wbid` or `wormbaseid` are provided. optional
         """
         super(Document, self).__init__(**kwargs)
-        self._fields = dict()
 
         self.id_precedence = ('doi', 'pmid', 'wbid', 'uri')
 
         if bibtex is not None:
             self.update_with_bibtex(bibtex)
 
-        if not self.pmid.has_defined_value() and pubmed is not None:
+        if pubmed is not None and not self.pmid.has_defined_value():
             if pubmed[:4] == 'http':
                 _tmp = _pubmed_uri_to_pmid(pubmed)
                 if _tmp is None:
@@ -126,7 +125,7 @@ def __init__(
                 pmid = pubmed
             self.pmid.set(pmid)
 
-        if not self.wbid.has_defined_value() and wormbase is not None:
+        if wormbase is not None and not self.wbid.has_defined_value():
             if wormbase[:4] == 'http':
                 _tmp = _wormbase_uri_to_wbid(wormbase)
                 if _tmp is None:
@@ -217,7 +216,7 @@ def crRequest(doi):
                 'http://search.labs.crossref.org/dois?%s' %
                 data_encoded)
 
-        doi = self._fields['doi']
+        doi = self.doi()
         if doi[:4] == 'http':
             doi = _doi_uri_to_doi(doi)
         try:

PyOpenWorm/simpleProperty.py

@@ -100,10 +100,9 @@ def has_defined_value(self):
         if self._hdf is not None:
             return self._hdf
         for x in self._v:
-            if x.context == self.context:
-                if x.object.defined:
-                    self._hdf = True
-                    return True
+            if x.context == self.context and x.object.defined:
+                self._hdf = True
+                return True
         return False
 
     def set(self, v):