dev

Author: davidhassell

cf/mixin/fielddomain.py

@@ -1345,6 +1345,7 @@ def autocyclic(self, key=None, coord=None, verbose=None, config={}):
             # Don't do anything
             return
 
+        # On a dry run, return as usual, but don't update _cyclic.
         dry_run = config.get("dry_run")
 
         if "cyclic" in config:
@@ -1364,31 +1365,16 @@ def autocyclic(self, key=None, coord=None, verbose=None, config={}):
                     self.cyclic(
                         key, iscyclic=True, period=period, config=config
                     )
-                    
+
                 return True
 
-#        if axis is not None:
-#            if coord is not None:
-#                raise ValueError("TODO")
-#            
-#            key, coord = self.dimension_coordinate(
-#                filter_by_axis=(axis,), item=True, default=(None, None)
-#            )
-#            if coord is None:
-#                if not dry_run:
-#                    self.cyclic(key, iscyclic=False, config=config)
-#
-#                return False
-            
         if coord is None:
             key, coord = self.dimension_coordinate(
                 "X", item=True, default=(None, None)
             )
             if coord is None:
-                if not dry_run:
-                    self.cyclic(key, iscyclic=False, config=config)
-
                 return False
+
         elif "X" in config:
             if not config["X"]:
                 if not dry_run:
@@ -1955,12 +1941,15 @@ def cyclic(
         cyclic = self._cyclic
 
         if not identity and not filter_kwargs:
-            cyclic  = cyclic.copy()
+            cyclic = cyclic.copy()
+
+            # Check for axes that are currently marked as non-cyclic,
+            # but are in fact cyclic.
             if (
-                    len(cyclic) < len(self.domain_axes(todict=True))
-                    and self.autocyclic()
+                len(cyclic) < len(self.domain_axes(todict=True))
+                and self.autocyclic()
             ):
-                cyclic = cyclic.update(self._cyclic)
+                cyclic.update(self._cyclic)
                 self._cyclic = cyclic
 
             return cyclic
@@ -2291,8 +2280,6 @@ def get_coordinate_reference(
     def iscyclic(self, *identity, **filter_kwargs):
         """Returns True if the given axis is cyclic.
 
-        If
-
         {{unique construct}}
 
         .. versionadded:: 1.0

cf/test/test_Domain.py

@@ -437,24 +437,53 @@ def test_Domain_cyclic_iscyclic(self):
         d2 = f2.domain
 
         # Getting
-        self.assertEqual(d1.cyclic(), f1.cyclic())
         self.assertEqual(d1.cyclic(), set())
+        self.assertEqual(d1.cyclic(), f1.cyclic())
         self.assertFalse(d1.iscyclic("X"))
         self.assertFalse(d1.iscyclic("Y"))
         self.assertFalse(d1.iscyclic("Z"))
         self.assertFalse(d1.iscyclic("T"))
-        self.assertEqual(d2.cyclic(), f2.cyclic())
+
         self.assertEqual(d2.cyclic(), set(("domainaxis2",)))
+        self.assertEqual(d2.cyclic(), f2.cyclic())
         self.assertTrue(d2.iscyclic("X"))
         self.assertFalse(d2.iscyclic("Y"))
         self.assertFalse(d2.iscyclic("Z"))
         self.assertFalse(d2.iscyclic("T"))
 
         # Setting
         self.assertEqual(d2.cyclic("X", iscyclic=False), set(("domainaxis2",)))
-        self.assertEqual(d2.cyclic(), set())
-        self.assertEqual(d2.cyclic("X", period=360), set())
         self.assertEqual(d2.cyclic(), set(("domainaxis2",)))
+
+        d2.cyclic("Y", period=360), set()
+        self.assertEqual(
+            d2.cyclic(),
+            set(
+                (
+                    "domainaxis1",
+                    "domainaxis2",
+                )
+            ),
+        )
+        self.assertTrue(d2.iscyclic("Y"))
+        self.assertEqual(
+            d2.cyclic("Y", iscyclic=False),
+            set(
+                (
+                    "domainaxis1",
+                    "domainaxis2",
+                )
+            ),
+        )
+        self.assertEqual(d2.cyclic(), set(("domainaxis2",)))
+
+        # Auto setting of cyclicity
+        self.assertTrue(d2.iscyclic("X"))
+        d2.cyclic("X", iscyclic=False)
+        self.assertFalse(d2._cyclic)
+        self.assertEqual(d2.cyclic(), set(("domainaxis2",)))
+
+        d2.cyclic("X", iscyclic=False)
         self.assertTrue(d2.iscyclic("X"))