Skip to content

Commit 79ee030

Browse files
Martin Hatinaj-mracek
authored andcommitted
use non-deprecated libmodulemd functions
1 parent 7e48554 commit 79ee030

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

dnf/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ def _setup_modules(self):
261261
try:
262262
with open(yaml_file, "r") as f:
263263
modules_yaml = f.read()
264-
module_metadata = Modulemd.Module.new_all_from_string_ext(modules_yaml)
264+
module_metadata = Modulemd.objects_from_string(modules_yaml)
265265
defaults = [i for i in module_metadata if isinstance(i, Modulemd.Defaults)]
266266
module_defaults_prioritizer.add(defaults, 1000)
267267
except IOError as ex:

dnf/module/repo_module_dict.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ def get_best_versions(self, module_specs):
349349
default_stream = module_version.repo_module.defaults.peek_default_stream()
350350
profile_defaults = module_version.repo_module.defaults.peek_profile_defaults()
351351
if default_stream in profile_defaults:
352-
default_profiles.extend(profile_defaults[default_stream].get())
352+
default_profiles.extend(profile_defaults[default_stream].dup())
353353

354354
if best_version < module_version:
355355
logger.info(module_messages[INSTALLING_NEWER_VERSION].format(best_version,
@@ -364,7 +364,7 @@ def get_best_versions(self, module_specs):
364364
default_stream = module_version.repo_module.defaults.peek_default_stream()
365365
profile_defaults = module_version.repo_module.defaults.peek_profile_defaults()
366366
if default_stream in profile_defaults:
367-
default_profiles.extend(profile_defaults[default_stream].get())
367+
default_profiles.extend(profile_defaults[default_stream].dup())
368368

369369
if module_form.profile:
370370
profiles = [module_form.profile]
@@ -513,7 +513,7 @@ def get_info(self, module_spec):
513513
default_stream = module_version.repo_module.defaults.peek_default_stream()
514514
profile_defaults = module_version.repo_module.defaults.peek_profile_defaults()
515515
if default_stream in profile_defaults:
516-
default_profiles.extend(profile_defaults[default_stream].get())
516+
default_profiles.extend(profile_defaults[default_stream].dup())
517517

518518
lines = OrderedDict()
519519
lines["Name"] = module_version.name

dnf/module/repo_module_version.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def __lt__(self, other):
3535
assert self.full_stream == other.full_stream
3636
if self.repo_module.conf.locked._get():
3737
return self.version < self.repo_module.conf.version._get()
38-
return self.module_metadata.get_version() < other.module_metadata.get_version()
38+
return self.module_metadata.peek_version() < other.module_metadata.peek_version()
3939

4040
def __repr__(self):
4141
return self.full_version
@@ -139,7 +139,7 @@ def remove(self, profiles):
139139
profiles=sorted(set(profiles)))
140140

141141
def artifacts(self):
142-
return self.module_metadata.get_rpm_artifacts().get()
142+
return self.module_metadata.peek_rpm_artifacts().dup()
143143

144144
def requires(self):
145145
requires = {}
@@ -149,17 +149,17 @@ def requires(self):
149149
return requires
150150

151151
def summary(self):
152-
return self.module_metadata.get_summary()
152+
return self.module_metadata.peek_summary()
153153

154154
def description(self):
155-
return self.module_metadata.get_description()
155+
return self.module_metadata.peek_description()
156156

157157
@staticmethod
158158
def nevra_object_to_nevr_str(nevra_object):
159159
return "{}-{}".format(nevra_object.name, nevra_object.evr())
160160

161161
def rpms(self, profile):
162-
return self.module_metadata.get_profiles()[profile].get_rpms().get()
162+
return self.module_metadata.peek_profiles()[profile].peek_rpms().dup()
163163

164164
def profile_nevra_objects(self, profile):
165165
result = []
@@ -174,26 +174,26 @@ def profile_nevra_objects(self, profile):
174174

175175
@property
176176
def version(self):
177-
return self.module_metadata.get_version()
177+
return self.module_metadata.peek_version()
178178

179179
@property
180180
def full_version(self):
181181
return "%s:%s:%s" % (
182-
self.module_metadata.get_name(), self.module_metadata.get_stream(),
183-
self.module_metadata.get_version())
182+
self.module_metadata.peek_name(), self.module_metadata.peek_stream(),
183+
self.module_metadata.peek_version())
184184

185185
@property
186186
def stream(self):
187-
return self.module_metadata.get_stream()
187+
return self.module_metadata.peek_stream()
188188

189189
@property
190190
def full_stream(self):
191-
return "%s-%s" % (self.module_metadata.get_name(), self.module_metadata.get_stream())
191+
return "%s-%s" % (self.module_metadata.peek_name(), self.module_metadata.peek_stream())
192192

193193
@property
194194
def name(self):
195-
return self.module_metadata.get_name()
195+
return self.module_metadata.peek_name()
196196

197197
@property
198198
def profiles(self):
199-
return sorted(self.module_metadata.get_profiles())
199+
return sorted(self.module_metadata.peek_profiles())

tests/modules/specs/_create_modulemd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def parse_module_id(module_id):
7373
sset.add("LGPLv2")
7474
mmd.set_module_licenses(sset)
7575
mmd.set_summary("Fake module")
76-
mmd.set_description(mmd.get_summary())
76+
mmd.set_description(mmd.peek_summary())
7777
artifacts = Modulemd.SimpleSet()
7878
for rpm in rpms:
7979
artifacts.add(rpm[:-4])

tests/test_modules.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def _create_mmd(name, stream, version, rpms=None, profiles=None):
201201
sset.add("LGPLv2")
202202
mmd.set_module_licenses(sset)
203203
mmd.set_summary(str("Fake module"))
204-
mmd.set_description(mmd.get_summary())
204+
mmd.set_description(mmd.peek_summary())
205205
artifacts = Modulemd.SimpleSet()
206206
for rpm in rpms:
207207
artifacts.add(rpm[:-4])

0 commit comments

Comments
 (0)