Use helper function for all the mos_target_num variants

Author: albireox

python/sdss_access/path/path.py

@@ -1793,7 +1793,7 @@ def tilegrp(self, filetype, **kwargs):
             return '{0}XX'.format(tileid)
         return '{:0>4d}XX'.format(int(tileid) // 1000)
 
-    def mos_target_num(self, filetype, zp: Union[int, None] = None, prefix: str = "-", **kwargs):
+    def _mos_target_num_helper(self, filetype, zp: Union[int, None] = None, prefix: str = "-", **kwargs):
         """Returns the target filetype for a given MOS filetype
 
         File species of the type ``mos_target_XXX`` can be used to retrieve
@@ -1834,26 +1834,36 @@ def mos_target_num(self, filetype, zp: Union[int, None] = None, prefix: str = "-
 
         return ""
 
+    def mos_target_num(self, filetype, **kwargs):
+        """Returns the target filetype for a given MOS filetype.
+
+        No zero-padding is applied to the number.
+
+        """
+
+        return self._mos_target_num_helper(filetype, zp=None, **kwargs)
+
+
     def mos_target_num2(self, filetype, **kwargs):
-        """Returns the target filetype for a given MOS filetype
+        """Returns the target filetype for a given MOS filetype.
 
         Same as ``mos_target_num`` but zero-pads the number to 2 digits.
 
         """
 
-        return self.mos_target_num(filetype, zp=2, **kwargs)
+        return self._mos_target_num_helper(filetype, zp=2, **kwargs)
 
     def mos_target_num3(self, filetype, **kwargs):
-        """Returns the target filetype for a given MOS filetype
+        """Returns the target filetype for a given MOS filetype.
 
         Same as ``mos_target_num`` but zero-pads the number to 3 digits.
 
         """
 
-        return self.mos_target_num(filetype, zp=3, **kwargs)
+        return self._mos_target_num_helper(filetype, zp=3, **kwargs)
 
     def mos_target_num_underscore(self, filetype, **kwargs):
-        """Returns the target filetype for a given MOS filetype
+        """Returns the target filetype for a given MOS filetype.
 
         Same as ``mos_target_num`` but the number is prefixed with an underscore
         instead of a dash.
@@ -1863,7 +1873,7 @@ def mos_target_num_underscore(self, filetype, **kwargs):
         if "num" not in kwargs or kwargs["num"] is None:
             kwargs["num"] = 1
 
-        return self.mos_target_num(filetype, prefix='_', **kwargs)
+        return self._mos_target_num_helper(filetype, zp=None, prefix='_', **kwargs)
 
 
 class AccessError(Exception):