diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/views.py')
-rw-r--r-- | bitbake/lib/toaster/toastergui/views.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 7fecdaa973..e2ead830b1 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -51,7 +51,7 @@ class MimeTypeFinder(object): | |||
51 | def get_mimetype(self, path): | 51 | def get_mimetype(self, path): |
52 | guess = mimetypes.guess_type(path, self._strict) | 52 | guess = mimetypes.guess_type(path, self._strict) |
53 | guessed_type = guess[0] | 53 | guessed_type = guess[0] |
54 | if guessed_type == None: | 54 | if guessed_type is None: |
55 | guessed_type = 'application/octet-stream' | 55 | guessed_type = 'application/octet-stream' |
56 | return guessed_type | 56 | return guessed_type |
57 | 57 | ||
@@ -126,7 +126,7 @@ def _lv_to_dict(prj, x = None): | |||
126 | return {"id": x.pk, | 126 | return {"id": x.pk, |
127 | "name": x.layer.name, | 127 | "name": x.layer.name, |
128 | "tooltip": "%s | %s" % (x.layer.vcs_url,x.get_vcs_reference()), | 128 | "tooltip": "%s | %s" % (x.layer.vcs_url,x.get_vcs_reference()), |
129 | "detail": "(%s" % x.layer.vcs_url + (")" if x.release == None else " | "+x.get_vcs_reference()+")"), | 129 | "detail": "(%s" % x.layer.vcs_url + (")" if x.release is None else " | "+x.get_vcs_reference()+")"), |
130 | "giturl": x.layer.vcs_url, | 130 | "giturl": x.layer.vcs_url, |
131 | "layerdetailurl" : reverse('layerdetails', args=(prj.id,x.pk)), | 131 | "layerdetailurl" : reverse('layerdetails', args=(prj.id,x.pk)), |
132 | "revision" : x.get_vcs_reference(), | 132 | "revision" : x.get_vcs_reference(), |
@@ -718,7 +718,7 @@ def _get_dir_entries(build_id, target_id, start): | |||
718 | resolved_id = o.sym_target_id | 718 | resolved_id = o.sym_target_id |
719 | resolved_path = o.path | 719 | resolved_path = o.path |
720 | if target_packages.count(): | 720 | if target_packages.count(): |
721 | while resolved_id != "" and resolved_id != None: | 721 | while resolved_id != "" and resolved_id is not None: |
722 | tf = Target_File.objects.get(pk=resolved_id) | 722 | tf = Target_File.objects.get(pk=resolved_id) |
723 | resolved_path = tf.path | 723 | resolved_path = tf.path |
724 | resolved_id = tf.sym_target_id | 724 | resolved_id = tf.sym_target_id |
@@ -730,10 +730,10 @@ def _get_dir_entries(build_id, target_id, start): | |||
730 | entry['package_id'] = str(p.id) | 730 | entry['package_id'] = str(p.id) |
731 | entry['package'] = p.name | 731 | entry['package'] = p.name |
732 | # don't use resolved path from above, show immediate link-to | 732 | # don't use resolved path from above, show immediate link-to |
733 | if o.sym_target_id != "" and o.sym_target_id != None: | 733 | if o.sym_target_id != "" and o.sym_target_id is not None: |
734 | entry['link_to'] = Target_File.objects.get(pk=o.sym_target_id).path | 734 | entry['link_to'] = Target_File.objects.get(pk=o.sym_target_id).path |
735 | entry['size'] = filtered_filesizeformat(o.size) | 735 | entry['size'] = filtered_filesizeformat(o.size) |
736 | if entry['link_to'] != None: | 736 | if entry['link_to'] is not None: |
737 | entry['permission'] = node_str[o.inodetype] + o.permission | 737 | entry['permission'] = node_str[o.inodetype] + o.permission |
738 | else: | 738 | else: |
739 | entry['permission'] = node_str[o.inodetype] + o.permission | 739 | entry['permission'] = node_str[o.inodetype] + o.permission |
@@ -755,7 +755,7 @@ def dirinfo(request, build_id, target_id, file_path=None): | |||
755 | objects = _get_dir_entries(build_id, target_id, '/') | 755 | objects = _get_dir_entries(build_id, target_id, '/') |
756 | packages_sum = Package.objects.filter(id__in=Target_Installed_Package.objects.filter(target_id=target_id).values('package_id')).aggregate(Sum('installed_size')) | 756 | packages_sum = Package.objects.filter(id__in=Target_Installed_Package.objects.filter(target_id=target_id).values('package_id')).aggregate(Sum('installed_size')) |
757 | dir_list = None | 757 | dir_list = None |
758 | if file_path != None: | 758 | if file_path is not None: |
759 | """ | 759 | """ |
760 | Link from the included package detail file list page and is | 760 | Link from the included package detail file list page and is |
761 | requesting opening the dir info to a specific file path. | 761 | requesting opening the dir info to a specific file path. |
@@ -1029,15 +1029,15 @@ def _get_package_dependency_count(package, target_id, is_installed): | |||
1029 | 1029 | ||
1030 | def _get_package_alias(package): | 1030 | def _get_package_alias(package): |
1031 | alias = package.installed_name | 1031 | alias = package.installed_name |
1032 | if alias != None and alias != '' and alias != package.name: | 1032 | if alias is not None and alias != '' and alias != package.name: |
1033 | return alias | 1033 | return alias |
1034 | else: | 1034 | else: |
1035 | return '' | 1035 | return '' |
1036 | 1036 | ||
1037 | def _get_fullpackagespec(package): | 1037 | def _get_fullpackagespec(package): |
1038 | r = package.name | 1038 | r = package.name |
1039 | version_good = package.version != None and package.version != '' | 1039 | version_good = package.version is not None and package.version != '' |
1040 | revision_good = package.revision != None and package.revision != '' | 1040 | revision_good = package.revision is not None and package.revision != '' |
1041 | if version_good or revision_good: | 1041 | if version_good or revision_good: |
1042 | r += '_' | 1042 | r += '_' |
1043 | if version_good: | 1043 | if version_good: |