Merge pull request winpython#1242 from stonebig/master

stonebig · web-flow · commit bbb87a3405b4 · 2023-07-08T15:05:24.000+02:00
more utf-8 , more piptree navigation
diff --git a/diff.py b/diff.py
@@ -95,8 +95,12 @@ def from_file(self, basedir):
             / f"WinPython{self.flavor}-{self.architecture}bit-{self.version}.md"
         )
 
-        with open(fname, "r") as fdesc:  # python3 doesn't like 'rb'
-            text = fdesc.read()
+        try:
+            with open(fname, "r", encoding = 'utf-8') as fdesc:  # python3 doesn't like 'rb'
+                text = fdesc.read()
+        except:
+            with open(fname, "r") as fdesc:  # python3 doesn't like 'rb'
+                text = fdesc.read()            
         self.from_text(text)
 
     def from_text(self, text):
diff --git a/make.py b/make.py
@@ -2022,7 +2022,7 @@ def make(
                 + f"{self.winpyver2}.md"
             )
         )
-        open(fname, "w").write(self.package_index_wiki)
+        open(fname, "w", encoding='utf-8').write(self.package_index_wiki)
         # Copy to winpython/changelogs
         shutil.copyfile(
             fname,
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '6.3.20230611'
+__version__ = '6.4.20230625'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/piptree.py b/winpython/piptree.py
@@ -14,10 +14,13 @@ def normalize(this):
 class pipdata:
     """Wrapper aroud pip inspect"""
 
-    def __init__(self):
+    def __init__(self, Target=None):
 
         # get pip_inpsect raw data in json form
-        pip_inspect = utils.exec_run_cmd(["pip", "inspect"])
+        if Target == None:
+            pip_inspect = utils.exec_run_cmd(["pip", "inspect"])
+        else:
+            pip_inspect = utils.exec_run_cmd(["chcp", "65001" ,"&", Target , "-m", "pip", "inspect"])        
         pip_json = json.loads(pip_inspect)
 
         # create a distro{} dict of Packages
@@ -194,6 +197,9 @@ def description(self, pp):
         if pp in self.distro:
             return print("\n".join(self.distro[pp]["description"].split(r"\n")))
 
-    def pip_list(self):
+    def pip_list(self, full=False):
         """do like pip list"""
-        return [(p, self.distro[p]["version"]) for p in sorted(self.distro)]
+        if full:
+            return [(p, self.distro[p]["version"], self.distro[p]["summary"]) for p in sorted(self.distro)]
+        else:
+            return [(p, self.distro[p]["version"]) for p in sorted(self.distro)]

Original file line number	Diff line number	Diff line change
`@@ -2022,7 +2022,7 @@ def make(`
`2022`	`2022`	`+ f"{self.winpyver2}.md"`
`2023`	`2023`	`)`
`2024`	`2024`	`)`
`2025`		`- open(fname, "w").write(self.package_index_wiki)`
	`2025`	`+ open(fname, "w", encoding='utf-8').write(self.package_index_wiki)`
`2026`	`2026`	`# Copy to winpython/changelogs`
`2027`	`2027`	`shutil.copyfile(`
`2028`	`2028`	`fname,`