Skip to content

Commit

Permalink
replace pkg_resources with importlib.resources
Browse files Browse the repository at this point in the history
  • Loading branch information
mobiusklein committed Jan 27, 2025
1 parent f9498b4 commit 242456b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
Empty file.
9 changes: 5 additions & 4 deletions src/glypy/io/nomenclature/synonyms.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import pkg_resources
import importlib
import importlib.resources
import json


Expand All @@ -16,9 +17,9 @@ def __init__(self, data):


class MonosaccharideSynonymIndex(SynonymIndex):
def __init__(self, stream=None):
if stream is None:
data_buffer = pkg_resources.resource_string(__name__, "data/monosaccharide_synonyms.json")
def __init__(self, data_buffer=None):
if data_buffer is None:
data_buffer = importlib.resources.read_text("glypy.io.nomenclature.data", "monosaccharide_synonyms.json")
if isinstance(data_buffer, bytes):
data_buffer = data_buffer.decode("utf-8")
super(MonosaccharideSynonymIndex, self).__init__(json.loads(data_buffer))
Expand Down
12 changes: 7 additions & 5 deletions src/glypy/structure/named_structures.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import pkg_resources
import importlib.resources
import hjson
import re

import importlib

from glypy.utils import StringIO, identity, uid
from glypy.utils.lazy import ProxyObject
from glypy.io import glycoct
Expand Down Expand Up @@ -47,7 +49,7 @@ def __str__(self): # pragma: no cover
class MonosaccharideIndex(StructureIndex):
def __init__(self, stream=None, key_transform=identity, value_transform=lambda x: x.root):
if stream is None:
stream = pkg_resources.resource_stream(__name__, "data/monosaccharides.hjson")
stream = importlib.resources.open_text("glypy.structure.data", "monosaccharides.hjson")
with stream:
super(MonosaccharideIndex, self).__init__(stream, key_transform, value_transform)

Expand All @@ -65,7 +67,7 @@ def value_transform(x):
return MonosaccharideResidue.from_monosaccharide(x.root)

if stream is None:
stream = pkg_resources.resource_stream(__name__, "data/monosaccharides.hjson")
stream = importlib.resources.open_text("glypy.structure.data", "monosaccharides.hjson")
super(MonosaccharideIndex, self).__init__(stream, key_transform, value_transform)


Expand All @@ -75,7 +77,7 @@ def value_transform(x):
class GlycanIndex(StructureIndex):
def __init__(self, stream=None, key_transform=identity, value_transform=identity):
if stream is None:
stream = pkg_resources.resource_stream(__name__, "data/glycans.hjson")
stream = importlib.resources.open_text("glypy.structure.data", "glycans.hjson")
super(GlycanIndex, self).__init__(stream, key_transform, value_transform)


Expand All @@ -85,7 +87,7 @@ def __init__(self, stream=None, key_transform=identity, value_transform=identity
class MotifIndex(StructureIndex):
def __init__(self, stream=None, key_transform=identity, value_transform=identity):
if stream is None:
stream = pkg_resources.resource_stream(__name__, "data/motifs.hjson")
stream = importlib.resources.open_text("glypy.structure.data", "motifs.hjson")
with stream:
data = hjson.load(stream)
motif_classes = set()
Expand Down

0 comments on commit 242456b

Please sign in to comment.