psu-python 0.2.3__tar.gz → 0.2.4__tar.gz

{psu_python-0.2.3/src/psu_python.egg-info → psu_python-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psu-python
-Version: 0.2.3
+Version: 0.2.4
 Summary: A python package for abstracting python class methods behind a fully functional layer intended for educational use in CMPSC 131 at The Pennsylvania State University
 Author-email: Theodore Tasman <psupython@ttasman.com>
 License-Expression: GPL-3.0

{psu_python-0.2.3 → psu_python-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name='psu-python'
-version='0.2.3'
+version='0.2.4'
 description='A python package for abstracting python class methods behind a fully functional layer intended for educational use in CMPSC 131 at The Pennsylvania State University'
 authors=[
     {name='Theodore Tasman', email='psupython@ttasman.com'}

{psu_python-0.2.3 → psu_python-0.2.4}/src/psu_python/dictionaries.py

@@ -18,12 +18,13 @@ def delete(key: Any, d: dict) -> Any:
     Returns:
         Any: The value of the popped key.
     """
+    # explicitly check type to prevent passing list which has .pop attribute
     if not isinstance(d, dict):
         raise TypeError("d must be of type dict")
-    
-    value = d.pop(key)
 
-    if value is None:
+    try:
+        value = d.pop(key)
+    except KeyError:
         raise KeyError(f"Key \"{key}\" not in dictionary")
     
     return value
@@ -38,10 +39,10 @@ def get_keys(d: dict) -> KeysView:
     Returns:
         KeysView: A view of the keys in `d`.
     """
-    if not isinstance(d, dict):
+    try:
+        return d.keys()
+    except AttributeError:
         raise TypeError("d must be of type dict")
-    
-    return d.keys()
 
 
 def get_values(d: dict) -> ValuesView:
@@ -53,10 +54,10 @@ def get_values(d: dict) -> ValuesView:
     Returns:
         ValuesView: A view of the values in `d`.
     """
-    if not isinstance(d, dict):
+    try:
+        return d.values()
+    except AttributeError:
         raise TypeError("d must be of type dict")
-    
-    return d.values()
 
 
 def get_items(d: dict) -> ItemsView:
@@ -68,10 +69,11 @@ def get_items(d: dict) -> ItemsView:
     Returns:
         ValuesView: A view of the (key, value) tuple pairs in `d`.
     """
-    if not isinstance(d, dict):
+    try:
+        return d.items()
+    except AttributeError:
         raise TypeError("d must be of type dict")
-    
-    return d.items()
+
 
 # get key from d
 def get_value(key: Any, d: dict, default: Any = None) -> Any:
@@ -85,7 +87,7 @@ def get_value(key: Any, d: dict, default: Any = None) -> Any:
     Returns:
         Any: The value corresponding to `key`, or `default` if not in `d`.
     """
-    if not isinstance(d, dict):
-        raise TypeError("d must be of type dict")
-    
-    return d.get(key, default)
+    try:
+        return d.get(key, default)
+    except AttributeError:
+        raise TypeError("d must be of type dict")

{psu_python-0.2.3 → psu_python-0.2.4}/src/psu_python/lists.py

@@ -1,6 +1,7 @@
 from typing import Any, Optional
 
-# "join list by separator"
+# "join list by separator" 
+# should really take any iterable, not specifically a list
 def join(lst: list, separator: str) -> str:
     """Join elements of a list into a single string, separated by a delimiter.
 
@@ -11,12 +12,13 @@ def join(lst: list, separator: str) -> str:
     Returns:
         str: a joined string of the list elements
     """
-    if not isinstance(separator, str):
+    try:
+        return separator.join(lst)
+    except AttributeError:
         raise TypeError("separator must be of type str")
-    if not isinstance(lst, list):
+    except TypeError:
         raise TypeError("lst must be of type list")
 
-    return separator.join(lst)
 
 # "append element to list"
 def append(element: Any, lst: list) -> None:
@@ -26,9 +28,11 @@ def append(element: Any, lst: list) -> None:
         lst (list): the list to append to
         element (Any): the item to append
     """
-    if not isinstance(lst, list):
+    try:
+        lst.append(element)
+    except AttributeError:
         raise TypeError("lst must be of type list")
-    lst.append(element)
+
 
 # "pop list[index]"
 def pop(lst: list, index: Optional[int] = None) -> Any:
@@ -44,15 +48,13 @@ def pop(lst: list, index: Optional[int] = None) -> Any:
     Returns:
         Any: The popped element.
     """
+    # explicitly check type to prevent passing dict which has .pop attribute
     if not isinstance(lst, list):
         raise TypeError("lst must be of type list")
-    if not isinstance(index, int) and index is not None:
-        raise TypeError("index must be None or of type int")
     
-    if index is not None and (index > len(lst) - 1 or -1 * index > len(lst)):
+    try:
+        return lst.pop() if index is None else lst.pop(index)
+    except IndexError:
         raise IndexError("pop index out of range")
-    
-    if index is None:
-        return lst.pop()
-    
-    return lst.pop(index)
+    except TypeError:
+        raise TypeError("index must be None or of type int")

psu_python-0.2.4/src/psu_python/strings.py

@@ -0,0 +1,42 @@
+from typing import Optional
+
+# split string by sep
+def split(string: str, sep: Optional[str] = None, maxsplit: int = -1) -> list[str]:
+    """Create a list of words in `string` separated by `sep`.
+
+    Args:
+        string (str): The string to split.
+        separator (str, optional): The separator delimiting words. If not specified or `None`, splits at whitespace.
+        maxsplit (int, optional): The maximum number of splits to complete. If not specified or `-1`, all possible splits are made.
+
+    Returns:
+        list: A list containing the words after splitting.
+    """
+    # explicitly check argument types since they cannot be differentiated via duck typing (both TypeError)
+    if sep is not None and not isinstance(sep, str):
+        raise TypeError("separator must be of type str")
+    if not isinstance(maxsplit, int):
+        raise TypeError("maxsplit must be of type int")
+
+    try:
+        return string.split(sep, maxsplit)
+    except AttributeError as exc:
+        raise TypeError("string must be of type str") from exc
+
+
+def strip(string: str, chars: Optional[str] = None) -> str:
+    """Remove characters in `chars` from beginning and end of `string`.
+
+    Args:
+        string (str): the string to strip.
+        chars (str, optional): string of characters to strip. If not specified or `None`, strips whitespace.
+
+    Returns:
+        str: a new string with characters stripped.
+    """
+    try:
+        return string.strip(chars)
+    except AttributeError:
+        raise TypeError("string must be of type str")
+    except TypeError:
+        raise TypeError("chars must be None or of type str")

{psu_python-0.2.3 → psu_python-0.2.4/src/psu_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psu-python
-Version: 0.2.3
+Version: 0.2.4
 Summary: A python package for abstracting python class methods behind a fully functional layer intended for educational use in CMPSC 131 at The Pennsylvania State University
 Author-email: Theodore Tasman <psupython@ttasman.com>
 License-Expression: GPL-3.0

psu_python-0.2.3/src/psu_python/strings.py

@@ -1,20 +0,0 @@
-from typing import Optional
-
-# split string by sep
-def split(string: str, sep: Optional[str] = None, maxsplit: int = -1) -> list[str]:
-    """Create a list of words in `string` separated by `sep`.
-
-    Args:
-        string (str): The string to split.
-        separator (str, optional): The separator delimiting words. If not specified or `None`, splits at whitespace.
-        maxsplit (int, optional): The maximum number of splits to complete. If not specified or `-1`, all possible splits are made.
-
-    Returns:
-        list: A list containing the words after splitting.
-    """
-    if not isinstance(string, str):
-        raise TypeError("string must be of type str")
-    if not isinstance(sep, str) and sep is not None:
-        raise TypeError("separator must be of type str")
-    
-    return string.split(sep, maxsplit)