Skip to content

Commit

Permalink
Remove unnecessary type casts
Browse files Browse the repository at this point in the history
  • Loading branch information
samj1912 committed Jul 16, 2017
1 parent fda9e84 commit be3e1ae
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion picard/album.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def _finalize_loading(self, error):
track.metadata['~pregap'] = "1"

tracklist_node = medium_node['tracks']
track_count = int(medium_node['track-count'])
track_count = medium_node['track-count']
if track_count:
for track_node in tracklist_node:
absolutetracknumber += 1
Expand Down
2 changes: 1 addition & 1 deletion picard/collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def request_finished(document, reply, error):
user_collections[node_id] = Collection(node_id, node['name'], node['release-count'])
else:
collection.name = node['name']
collection.size = int(node['release-count'])
collection.size = node['release-count']

for collection_id in set(user_collections.keys()) - new_collections:
del user_collections[collection_id]
Expand Down
4 changes: 2 additions & 2 deletions picard/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -666,14 +666,14 @@ def iterfiles(self, save=False):

def _get_tracknumber(self):
try:
return int(self.metadata["tracknumber"])
return self.metadata["tracknumber"]
except:
return 0
tracknumber = property(_get_tracknumber, doc="The track number as an int.")

def _get_discnumber(self):
try:
return int(self.metadata["discnumber"])
return self.metadata["discnumber"]
except:
return 0
discnumber = property(_get_discnumber, doc="The disc number as an int.")
6 changes: 3 additions & 3 deletions picard/mbjson.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ def track_to_metadata(node, track):
if key in _TRACK_TO_METADATA:
m[_TRACK_TO_METADATA[key]] = value
elif key == 'length' and value:
m.length = int(value)
m.length = value
elif key == 'artist-credit':
artist_credit_to_metadata(value, m)
m['~length'] = format_time(m.length)
Expand All @@ -318,7 +318,7 @@ def recording_to_metadata(node, m, track=None):
if key in _RECORDING_TO_METADATA:
m[_RECORDING_TO_METADATA[key]] = value
elif key == 'length':
m.length = int(value)
m.length = value
elif key == 'artist-credit':
artist_credit_to_metadata(value, m)
# set tags from artists
Expand Down Expand Up @@ -447,7 +447,7 @@ def add_folksonomy_tags(node, obj):
if obj is not None:
for tag in node:
key = tag['name']
count = int(tag['count'])
count = tag['count']
obj.add_folksonomy_tag(key, count)


Expand Down
6 changes: 3 additions & 3 deletions picard/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ def compare_to_release_parts(self, release, weights):
else:
try:
if "title" in weights:
b = int(release['media'][0]['track-count'])
b = release['media'][0]['track-count']
else:
b = int(release['track-count'])
b = release['track-count']
except (KeyError, TypeError):
pass
else:
Expand Down Expand Up @@ -208,7 +208,7 @@ def compare_to_track(self, track, weights):

a = self.length
if a > 0 and 'length' in track:
b = int(track['length'])
b = track['length']
score = 1.0 - min(abs(a - b), 30000) / 30000.0
parts.append((score, weights["length"]))

Expand Down
2 changes: 1 addition & 1 deletion picard/releasegroup.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def _parse_versions(self, document):
if "disambiguation" in node
else None,
"_disambiguate_name": list(),
"totaltracks": sum([int(m['track-count']) for m in node['media']]),
"totaltracks": sum([m['track-count'] for m in node['media']]),
"countries": countries,
"formats": formats,
}
Expand Down

0 comments on commit be3e1ae

Please sign in to comment.