fix bug and remove support for py2

MohammadRimawi · Aug 29, 2023 · 54c3887 · 54c3887
1 parent 6983bf4
commit 54c3887
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ __pycache__/
 beeprint.egg-info/*
 build/*
 dist/*
+py310/
diff --git a/beeprint/helpers/string.py b/beeprint/helpers/string.py
@@ -14,6 +14,8 @@
 
 
 def calc_width(s):
+    if hasattr(urwid, 'util'):
+        return urwid.util.calc_width(s, 0, len(s))
     return urwid.str_util.calc_width(s, 0, len(s))
 
 

diff --git a/makefile b/makefile
@@ -12,6 +12,8 @@ register:
 	python setup.py register -r pypitest || true
 
 full:
+	# TypeError: Retry.__init__() got an unexpected keyword argument 'method_whitelist'
+	# solved: pip install 'urllib3<2'
 	python setup.py sdist
 	twine upload dist/*
 	# python2.7 setup.py bdist_egg upload

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 pprintpp==0.3.0
-urwid==1.3.1
+urwid==2.1.2
 twine==1.8.1
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 setup(
     name = 'beeprint',
     packages = ['beeprint', 'beeprint.models', 'beeprint.helpers', 'beeprint.lib'], # this must be the same as the name above
-    version = '2.4.10',
+    version = '2.4.11',
     description = 'make your debug printing more friendly',
     author = 'Yangyang Pan',
     author_email = '[email protected]',
@@ -11,7 +11,7 @@
     keywords = ['print', 'pprint', 'format', 'debug'], # arbitrary keywords
     classifiers = [
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
+        # "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ __pycache__/ @@
     beeprint.egg-info/*
     build/*
     dist/*
+    py310/