Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit6175a71

Browse files
authored
Merge pull request#1634 from stonebig/master
taking gloves, as bitten per this dark art
2 parents0863194 +b84ef84 commit6175a71

File tree

1 file changed

+12
-23
lines changed

1 file changed

+12
-23
lines changed

‎winpython/packagemetadata.py

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python3
1+
# -*- coding: utf-8 -*-
22
"""
33
packagemetadata.py - get metadata from designated place
44
"""
@@ -8,12 +8,11 @@
88
importzipfile
99
importsys
1010
frompathlibimportPath
11-
fromcollectionsimportdefaultdict
12-
importshutil
13-
importsubprocess
1411
fromtypingimportDict,List,Optional,Tuple
1512
from .importutils
16-
13+
importimportlib.metadata
14+
importemail
15+
frompackaging.utilsimportcanonicalize_name
1716
# --- Abstract metadata accessor ---
1817

1918
classPackageMetadata:
@@ -28,11 +27,10 @@ def __init__(self, name, version, requires, summary, description, metadata):
2827

2928
defget_installed_metadata(path=None)->List[PackageMetadata]:
3029
# Use importlib.metadata or pkg_resources
31-
importimportlib.metadata
3230
pkgs= []
3331
distro=importlib.metadata.distributions(path=path)ifpathelseimportlib.metadata.distributions()
3432
fordistindistro:
35-
name=dist.metadata['Name']
33+
name=canonicalize_name(dist.metadata['Name'])
3634
version=dist.version
3735
summary=dist.metadata.get("Summary",""),
3836
description=dist.metadata.get("Description",""),
@@ -56,7 +54,6 @@ def get_directory_metadata(directory: str) -> List[PackageMetadata]:
5654
returnpkgs
5755

5856
defextract_metadata_from_wheel(path:str)->PackageMetadata:
59-
importzipfile
6057
withzipfile.ZipFile(path)aszf:
6158
fornameinzf.namelist():
6259
ifname.endswith(r'.dist-info/METADATA')andname.split("/")[1]=="METADATA":
@@ -66,7 +63,6 @@ def extract_metadata_from_wheel(path: str) -> PackageMetadata:
6663
raiseValueError(f"No METADATA found in{path}")
6764

6865
defextract_metadata_from_sdist(path:str)->PackageMetadata:
69-
importtarfile
7066
withtarfile.open(path,"r:gz")astf:
7167
formemberintf.getmembers():
7268
ifmember.name.endswith('PKG-INFO'):
@@ -75,20 +71,13 @@ def extract_metadata_from_sdist(path: str) -> PackageMetadata:
7571
raiseValueError(f"No PKG-INFO found in{path}")
7672

7773
defparse_metadata_file(txt:str)->PackageMetadata:
78-
name=version=summary=description=""
79-
requires= []
80-
description_lines= []
81-
in_description=False
82-
forlineintxt.splitlines():
83-
ifline.startswith('Name: '):
84-
name=line[6:].strip()
85-
elifline.startswith('Version: '):
86-
version=line[9:].strip()
87-
elifline.startswith('Summary: '):
88-
summary=description=line[9:].strip()
89-
elifline.startswith('Requires-Dist: '):
90-
requires.append(line[14:].strip())
91-
returnPackageMetadata(name,version,requires,summary,description, {'Name':name,"Summary":summary,"Description":description})
74+
meta=email.message_from_string(txt)
75+
name=canonicalize_name(meta.get('Name',''))
76+
version=meta.get('Version','')
77+
summary=meta.get('Summary','')
78+
description=meta.get('Description','')
79+
requires=meta.get_all('Requires-Dist')or []
80+
returnPackageMetadata(name,version,requires,summary,description,dict(meta.items()))
9281

9382
defmain():
9483
iflen(sys.argv)>1:

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp