Merge branch 'chunfuwen-python3_fix_avocado-vt_bootstrap_issue_due_to_none_type'

Signed-off-by: NAmador Pahim <apahim@redhat.com>

avocado/core/data_dir.py

@@ -231,7 +231,8 @@ class _TmpDirTracker(Borg):
             try:
                 if os.path.isdir(tmp_dir):
                     shutil.rmtree(tmp_dir)
-            except AttributeError:
+            # Need catch AttributeError and TypeError.
+            except (AttributeError, TypeError):
                 pass