break(Lib): use OptionalObj for datetime.tzname, inspect's, signal.strsignal, os.*_cpu_count

Author: litlighilit

src/pylib/Lib/datetime.nim

@@ -5,26 +5,28 @@ export n_datetime except tzname, isoformat, strftime, ctime
 
 import ../pystring/strimpl
 import ../noneType
+import ./typing_impl/str_optional_obj
+expOptObjCvt()
 import ../pyerrors/simperr
 
 
 method tzname*(tz: tzinfo; dt: datetime): PyStr{.base.} =
   str n_datetime.tzname(tz, dt)
 method tzname*(tz: timezone; dt: datetime): PyStr =
   str n_datetime.tzname(tz, dt)
-func tzname*(dt: datetime): PyStr =
-  ## .. hint:: this won't returns `None`, but may return a empty string
-  str n_datetime.tzname(dt)
+func tzname*(dt: datetime): OptionalObj[PyStr] =
+  newStrOptionalObj n_datetime.tzname(dt)
 
 using self: datetime # | date
 func strftime*(self; format: PyStr): PyStr = str n_datetime.strftime(self, $format)
 func isoformat*(self; sep: StringLike = 'T', timespec="auto"): PyStr =
   template lenErr =
     raise newException(TypeError, "isoformat() argument 1 must be a unicode character, not str")
-  when sep is string:
-    let sep = str sep    
+  when system.`is`(sep, string):
+    # NIM-BUG: have to prefix by `system` once optional_obj.`is` imported
+    let sep = str sep
   if sep.len != 1: lenErr()
-  when sep is char:
+  when system.`is`(sep, char):
     let ch = sep
   else:
     let ch = $sep

src/pylib/Lib/inspect.nim

@@ -12,6 +12,8 @@ export list_decl
 
 import ../pystring/strimpl
 export strimpl
+import ./typing_impl/str_optional_obj
+expOptObjCvt()
 from ../pystring/strmeth import splitlines
 import ../version
 
@@ -37,8 +39,11 @@ gen_getmembers_static pysince(3,11)
 template wrapPyStr1(fun; T){.dirty.} =
   template fun*(obj: T): PyStr =
     str n_inspect.fun(obj)
+template wrapPyOptStr1(fun; T){.dirty.} =
+  template fun*(obj: T): OptionalObj[PyStr] =
+    newStrOptionalObj n_inspect.fun(obj)
 
-wrapPyStr1 getmodulename, PyStr
+wrapPyOptStr1 getmodulename, PyStr
 
 wrapExportSincePy(3,12, markcoroutinefunction)
 
@@ -49,12 +54,13 @@ wrapExportSincePy(3,5, isawaitable)
 
 
 template wrapPyStr1(fun){.dirty.} = wrapPyStr1(fun, untyped)
+template wrapPyOptStr1(fun){.dirty.} = wrapPyOptStr1(fun, untyped)
 
 wrapPyStr1 cleandoc, PyStr
 wrapPyStr1 getfile
-wrapPyStr1 getsourcefile
+wrapPyOptStr1 getsourcefile
 wrapPyStr1 getsource
-wrapPyStr1 getdoc
+wrapPyOptStr1 getdoc
 
 macro getsourcelines*(obj: typed): (PyList[string], int) =
   ## get source code of the object

src/pylib/Lib/os.nim

@@ -11,8 +11,11 @@ import ./os_impl/private/platform_utils
 import ../pyconfig/bootstrap_hash
 
 import ./n_os
-export n_os except scandir, DirEntry, urandom, getrandom, genUname, uname, uname_result, sched_getaffinity, sched_setaffinity
-
+export n_os except scandir, DirEntry, urandom, getrandom, genUname, uname, uname_result,
+  sched_getaffinity, sched_setaffinity,
+  cpu_count, process_cpu_count
+import ./typing_impl/optional_obj
+expOptObjCvt()
 import ../version
 genUname PyStr
 template scandir*(): untyped{.pysince(3,5).} = n_os.scandir()
@@ -40,3 +43,12 @@ when HAVE_SCHED_SETAFFINITY:
     result = newPySet[int]()
     sched_getaffinityImpl(pid) do (x: cint):
       result.add int x
+
+template wrapMayNone(name){.dirty.} =
+  proc name*(): OptionalObj[int] =
+    let res = n_os.name()
+    if res > 0: newOptionalObj(res)
+    else: newOptionalObj[int]()
+
+wrapMayNone cpu_count
+wrapMayNone process_cpu_count

src/pylib/Lib/signal.nim

@@ -4,6 +4,8 @@ import ./signal_impl/valid_signals_impl
 
 import ../builtins/set
 import ../pystring/strimpl
+import ./typing_impl/str_optional_obj
+expOptObjCvt()
 import ../version
 
 export n_signal except sigpending, pthread_sigmask, strsignal, valid_signals
@@ -26,8 +28,8 @@ proc pthread_sigmask*(how: int, mask: Sigset): PySet[int]{.mayUndef.} =
     result.fromIterable oa
   ]#
 
-proc strsignal*(signalnum: int): PyStr{.pysince(3,8).} =
-  str n_signal.strsignal signalnum
+proc strsignal*(signalnum: int): OptionalObj[PyStr]{.pysince(3,8).} =
+  newStrOptionalObj n_signal.strsignal signalnum
 
 when have_valid_signals:
   proc valid_signals*(): PySet[int]{.pysince(3,8).} =