KL-Py 0.4.5__tar.gz → 0.4.7__tar.gz

{kl_py-0.4.5 → kl_py-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KL_Py
-Version: 0.4.5
+Version: 0.4.7
 Summary: A Python simplification module
 Author-email: Abbaskhurram255 <abbaskhurram255@gmail.com>
 Classifier: Programming Language :: Python :: 3

{kl_py-0.4.5 → kl_py-0.4.7}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "KL_Py"
-version = "0.4.5"
+version = "0.4.7"
 authors = [
     { name = "Abbaskhurram255", email = "abbaskhurram255@gmail.com" }
 ]

{kl_py-0.4.5 → kl_py-0.4.7}/src/KL_Py/KL_Py.py

@@ -69,10 +69,42 @@ NON_NUM_RE: str = r"[^Ee\+\-\.\d]|(?<=[A-Za-z_])[Ee]|[Ee\.](?![\d\+\-])|(?<![^\d
 INT_RE = INTEGEGER_RE = INT_REGEX = INTEGEGER_REGEX = r"\-?\d+"
 WORD_RE = WORD_REGEX = r"[A-Za-z_\'][\w\']*(?:\-[A-Za-z_\']\w*(?: [A-Za-z_\'][\w\']*){0})*"
 NON_WORD_RE = NON_WORD_REGEX = r"[^A-Za-z_\-]|\-(?![A-Za-z_])"
-def __rgx_is_full_match__(pattern, s): return bool(re.search(f"^{pattern}$", str(s) if s is not None else ""))
+def __rgx_is_full_match__(
+	pattern,
+	s
+):
+		return bool(
+			re.search(
+				f"^{pattern}$",
+				str(s)\
+					if s is not None\
+					else ""
+			)
+		)
 def __rgx_catch__(pattern, s) -> str | list[str]:
-	matches: list[str] = re.findall(pattern, str(s) if s is not None else "")
-	return matches[0] if len(matches) == 1 else matches
+	matches: list[str] = re.findall(
+		pattern,
+		str(s)\
+			if s is not None\
+			else ""
+	)
+	matches = [
+		"".join(m)\
+			if isinstance(
+				m,
+				(
+					list,
+					tuple
+				)
+			)\
+			else m
+				for m in matches\
+					if m
+	]
+	result: str | list[str] = matches[0]\
+		if len(matches) == 1\
+		else matches
+	return result
 jumle_me_he = lafz_me_he = lambda y, x: re.search(y, x) or False if isinstance(y, str) and isinstance(x, str) else False
 is_mail = is_email = ismail = isemail = lambda s: __rgx_is_full_match__(MAIL_RE, s)
 he_mail = hemail = he_email = heemail = is_mail
@@ -520,7 +552,7 @@ def rand_range(start: int = 9, stop: int|None = None) -> list[int]:
 				for _ in range(length)
 		]
 randrange = rand_range
-def randphone(cc: str = "92", n=1) -> str:
+def randphone(n=1, cc: str = "92") -> str:
 	if not isinstance(
 		n,
 		int
@@ -550,9 +582,15 @@ def randphone(cc: str = "92", n=1) -> str:
 		str
 	] = []
 	for _ in range(n):
-		num: str = f"+{cc}"
+		num: str = f"+{cc}3"
 		if cc == "92":
-			num += "3"
+			num += str(
+				random\
+					.randint(
+						0,
+						4
+					)
+			)
 		else:
 			num += str(
 				random\
@@ -570,7 +608,7 @@ def randphone(cc: str = "92", n=1) -> str:
 							9
 						)\
 							for _\
-							in range(9)
+							in range(8)
 					]
 			]
 		)

{kl_py-0.4.5 → kl_py-0.4.7}/src/KL_Py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KL_Py
-Version: 0.4.5
+Version: 0.4.7
 Summary: A Python simplification module
 Author-email: Abbaskhurram255 <abbaskhurram255@gmail.com>
 Classifier: Programming Language :: Python :: 3