|
@@ -51,7 +51,7 @@ class MimeTypeFinder(object):
|
|
|
def get_mimetype(self, path):
|
|
|
guess = mimetypes.guess_type(path, self._strict)
|
|
|
guessed_type = guess[0]
|
|
|
- if guessed_type == None:
|
|
|
+ if guessed_type is None:
|
|
|
guessed_type = 'application/octet-stream'
|
|
|
return guessed_type
|
|
|
|
|
@@ -126,7 +126,7 @@ def _lv_to_dict(prj, x = None):
|
|
|
return {"id": x.pk,
|
|
|
"name": x.layer.name,
|
|
|
"tooltip": "%s | %s" % (x.layer.vcs_url,x.get_vcs_reference()),
|
|
|
- "detail": "(%s" % x.layer.vcs_url + (")" if x.release == None else " | "+x.get_vcs_reference()+")"),
|
|
|
+ "detail": "(%s" % x.layer.vcs_url + (")" if x.release is None else " | "+x.get_vcs_reference()+")"),
|
|
|
"giturl": x.layer.vcs_url,
|
|
|
"layerdetailurl" : reverse('layerdetails', args=(prj.id,x.pk)),
|
|
|
"revision" : x.get_vcs_reference(),
|
|
@@ -718,7 +718,7 @@ def _get_dir_entries(build_id, target_id, start):
|
|
|
resolved_id = o.sym_target_id
|
|
|
resolved_path = o.path
|
|
|
if target_packages.count():
|
|
|
- while resolved_id != "" and resolved_id != None:
|
|
|
+ while resolved_id != "" and resolved_id is not None:
|
|
|
tf = Target_File.objects.get(pk=resolved_id)
|
|
|
resolved_path = tf.path
|
|
|
resolved_id = tf.sym_target_id
|
|
@@ -730,10 +730,10 @@ def _get_dir_entries(build_id, target_id, start):
|
|
|
entry['package_id'] = str(p.id)
|
|
|
entry['package'] = p.name
|
|
|
# don't use resolved path from above, show immediate link-to
|
|
|
- if o.sym_target_id != "" and o.sym_target_id != None:
|
|
|
+ if o.sym_target_id != "" and o.sym_target_id is not None:
|
|
|
entry['link_to'] = Target_File.objects.get(pk=o.sym_target_id).path
|
|
|
entry['size'] = filtered_filesizeformat(o.size)
|
|
|
- if entry['link_to'] != None:
|
|
|
+ if entry['link_to'] is not None:
|
|
|
entry['permission'] = node_str[o.inodetype] + o.permission
|
|
|
else:
|
|
|
entry['permission'] = node_str[o.inodetype] + o.permission
|
|
@@ -755,7 +755,7 @@ def dirinfo(request, build_id, target_id, file_path=None):
|
|
|
objects = _get_dir_entries(build_id, target_id, '/')
|
|
|
packages_sum = Package.objects.filter(id__in=Target_Installed_Package.objects.filter(target_id=target_id).values('package_id')).aggregate(Sum('installed_size'))
|
|
|
dir_list = None
|
|
|
- if file_path != None:
|
|
|
+ if file_path is not None:
|
|
|
"""
|
|
|
Link from the included package detail file list page and is
|
|
|
requesting opening the dir info to a specific file path.
|
|
@@ -1029,15 +1029,15 @@ def _get_package_dependency_count(package, target_id, is_installed):
|
|
|
|
|
|
def _get_package_alias(package):
|
|
|
alias = package.installed_name
|
|
|
- if alias != None and alias != '' and alias != package.name:
|
|
|
+ if alias is not None and alias != '' and alias != package.name:
|
|
|
return alias
|
|
|
else:
|
|
|
return ''
|
|
|
|
|
|
def _get_fullpackagespec(package):
|
|
|
r = package.name
|
|
|
- version_good = package.version != None and package.version != ''
|
|
|
- revision_good = package.revision != None and package.revision != ''
|
|
|
+ version_good = package.version is not None and package.version != ''
|
|
|
+ revision_good = package.revision is not None and package.revision != ''
|
|
|
if version_good or revision_good:
|
|
|
r += '_'
|
|
|
if version_good:
|