Merge pull request #1625 from seleniumbase/special-chars-and-dependencies

Special chars and dependencies

Author: mdmintz

help_docs/recorder_mode.md

@@ -29,8 +29,8 @@ pytest new_test.py --rec -q -s --url=wikipedia.org
 >>>>>>>>>>>>>>>>>> PDB set_trace >>>>>>>>>>>>>>>>>
 
 -> import pdb; pdb.set_trace()
-> .../YOUR_CURRENT_DIRECTORY/new_test.py(9)
-
+> PATH_TO_YOUR_CURRENT_DIRECTORY/new_test.py(9)
+....
    5         def test_recording(self):
    6             if self.recorder_ext and not self.xvfb:
    7                 # When you are done recording actions,

requirements.txt

@@ -33,7 +33,8 @@ chardet==4.0.0;python_version>="3.6" and python_version<"3.7"
 chardet==5.0.0;python_version>="3.7"
 charset-normalizer==2.0.12;python_version>="3.6" and python_version<"3.7"
 charset-normalizer==2.1.1;python_version>="3.7"
-urllib3==1.26.13
+urllib3==1.26.12;python_version<"3.7"
+urllib3==1.26.13;python_version>="3.7"
 requests==2.27.1;python_version<"3.6"
 requests==2.27.1;python_version>="3.6" and python_version<"3.7"
 requests==2.28.1;python_version>="3.7"
@@ -98,7 +99,7 @@ pyreadline==2.1;platform_system=="Windows" and python_version<"3.6"
 pyreadline3==3.4.1;platform_system=="Windows" and python_version>="3.6"
 pyrepl==0.9.0
 tabcompleter==1.0.0
-pdbp==1.0.0
+pdbp==1.1.0
 colorama==0.4.6;python_version<"3.6"
 colorama==0.4.5;python_version>="3.6" and python_version<"3.7"
 colorama==0.4.6;python_version>="3.7"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.9.2"
+__version__ = "4.9.3"

seleniumbase/console_scripts/sb_print.py

@@ -33,16 +33,17 @@ def invalid_run_command(msg=None):
 
 
 def sc_ranges():
-    # Get the ranges of special characters of Chinese, Japanese, and Korean.
+    # Get the ranges of special double-width characters.
     special_char_ranges = [
         {"from": ord("\u4e00"), "to": ord("\u9FFF")},
         {"from": ord("\u3040"), "to": ord("\u30ff")},
         {"from": ord("\uac00"), "to": ord("\ud7a3")},
+        {"from": ord("\uff01"), "to": ord("\uff60")},
     ]
     return special_char_ranges
 
 
-def is_cjk(char):
+def is_char_wide(char):
     # Returns True if the special character is Chinese, Japanese, or Korean.
     sc = any(
         [range["from"] <= ord(char) <= range["to"] for range in sc_ranges()]
@@ -52,10 +53,10 @@ def is_cjk(char):
 
 def get_width(line):
     # Return the true width of the line. Not the same as line length.
-    # Chinese/Japanese/Korean characters take up double width visually.
+    # Chinese/Japanese/Korean characters take up two spaces of width.
     line_length = len(line)
     for char in line:
-        if is_cjk(char):
+        if is_char_wide(char):
             line_length += 1
     return line_length
 

setup.py

@@ -158,7 +158,8 @@
         'chardet==5.0.0;python_version>="3.7"',  # Stay in sync with "requests"
         'charset-normalizer==2.0.12;python_version>="3.6" and python_version<"3.7"',  # noqa: E501
         'charset-normalizer==2.1.1;python_version>="3.7"',  # Sync "requests"
-        'urllib3==1.26.13',  # Stay in sync with "requests"
+        'urllib3==1.26.12;python_version<"3.7"',
+        'urllib3==1.26.13;python_version>="3.7"',
         'requests==2.27.1;python_version<"3.7"',
         'requests==2.28.1;python_version>="3.7"',
         'requests-toolbelt==0.10.1',
@@ -222,7 +223,7 @@
         'pyreadline3==3.4.1;platform_system=="Windows" and python_version>="3.6"',  # noqa: E501
         "pyrepl==0.9.0",
         "tabcompleter==1.0.0",
-        "pdbp==1.0.0",
+        "pdbp==1.1.0",
         'colorama==0.4.6;python_version<"3.6"',
         'colorama==0.4.5;python_version>="3.6" and python_version<"3.7"',
         'colorama==0.4.6;python_version>="3.7"',