Use removeprefix

Author: Cito

webware/Admin/Errors.py

@@ -18,9 +18,7 @@ def cellContents(self, _rowIndex, colIndex, value):
         if self._headings[colIndex] in ('pathname', 'error report filename'):
             path = self.application().serverSidePath()
             if value.startswith(path):
-                value = value[len(path):]
-                if value.startswith(sep):
-                    value = value[len(sep):]
+                value = value.removeprefix(path).removeprefix(sep)
                 link = f'View?filename={urlEncode(value)}'
                 value = value.replace(sep, sep + '<wbr>')
                 value = f'<a href="{link}">{value}</a>'

webware/Examples/Colors.py

@@ -24,8 +24,7 @@ def rgbToHexColor(r, g, b):
 def hexToRgbColor(h):
     """Convert #RRGGBB to r, g, b."""
     h = h.strip()
-    if h.startswith('#'):
-        h = h[1:]
+    h = h.removeprefix('#')
     h = h[:2], h[2:4], h[4:]
     return [int(x, 16) for x in h]
 

webware/HTTPRequest.py

@@ -351,8 +351,7 @@ def serverSidePath(self, path=None):
         server side directory to form a path relative to the object.
         """
         if path:
-            if path.startswith('/'):
-                path = path[1:]
+            path = path.removeprefix('/')
             return os.path.normpath(os.path.join(
                 os.path.dirname(self._serverSidePath), path))
         return self._serverSidePath
@@ -367,8 +366,7 @@ def serverSideContextPath(self, path=None):
         if the request is in a subdirectory of the main context directory.
         """
         if path:
-            if path.startswith('/'):
-                path = path[1:]
+            path = path.removeprefix('/')
             return os.path.normpath(os.path.join(
                 self._serverSideContextPath, path))
         return self._serverSideContextPath
@@ -385,15 +383,11 @@ def servletURI(self):
         """Return servlet URI without any query strings or extra path info."""
         p = self._pathInfo
         if not self._extraURLPath:
-            if p.endswith('/'):
-                p = p[:-1]
-            return p
+            return p.removesuffix('/')
         i = p.rfind(self._extraURLPath)
         if i >= 0:
             p = p[:i]
-        if p.endswith('/'):
-            p = p[:-1]
-        return p
+        return p.removesuffix('/')
 
     def uriWebwareRoot(self):
         """Return relative URL path of the Webware root location."""
@@ -494,11 +488,9 @@ def siteRoot(self):
         of the servlet that you have forwarded to.
         """
         url = self.originalURLPath()
-        if url.startswith('/'):
-            url = url[1:]
+        url = url.removeprefix('/')
         contextName = self.contextName() + '/'
-        if url.startswith(contextName):
-            url = url[len(contextName):]
+        url = url.removeprefix(contextName)
         numStepsBack = url.count('/')
         return '../' * numStepsBack
 
@@ -512,11 +504,9 @@ def siteRootFromCurrentServlet(self):
         relative to the _current_ servlet, not the _original_ servlet.
         """
         url = self.urlPath()
-        if url.startswith('/'):
-            url = url[1:]
+        url = url.removeprefix('/')
         contextName = self.contextName() + '/'
-        if url.startswith(contextName):
-            url = url[len(contextName):]
+        url = url.removeprefix(contextName)
         numStepsBackward = url.count('/')
         return '../' * numStepsBackward
 
@@ -529,8 +519,7 @@ def servletPathFromSiteRoot(self):
         servlet in a database, for example.
         """
         urlPath = self.urlPath()
-        if urlPath.startswith('/'):
-            urlPath = urlPath[1:]
+        urlPath = urlPath.removeprefix('/')
         parts = urlPath.split('/')
         newParts = []
         for part in parts:

webware/Servlet.py

@@ -155,8 +155,7 @@ def serverSidePath(self, path=None):
         if self._serverSidePath is None:
             self._serverSidePath = self._transaction.request().serverSidePath()
         if path:
-            if path.startswith('/'):
-                path = path[1:]
+            path = path.removeprefix('/')
             return os.path.normpath(os.path.join(
                 os.path.dirname(self._serverSidePath), path))
         return self._serverSidePath