Remove QubesVM.is_netvm() and is_disposablevm()

qubes/backup.py

@@ -1944,10 +1944,10 @@ class BackupRestore(object):
             "qid": {"func": "vm.qid"},
 
             "name": {"func": "('[' if isinstance(vm, qubes.vm.templatevm.TemplateVM) else '')\
-                     + ('{' if vm.is_netvm() else '')\
+                     + ('{' if vm.provides_network else '')\
                      + vm.name \
                      + (']' if isinstance(vm, qubes.vm.templatevm.TemplateVM) else '')\
-                     + ('}' if vm.is_netvm() else '')"},
+                     + ('}' if vm.provides_network else '')"},
 
             "type": {"func": "'Tpl' if isinstance(vm, qubes.vm.templatevm.TemplateVM) else \
                      'App' if isinstance(vm, qubes.vm.appvm.AppVM) else \
@@ -1958,7 +1958,7 @@ class BackupRestore(object):
             "template": {"func": "'n/a' if not hasattr(vm, 'template') is None "
                                  "else vm_info.template"},
 
-            "netvm": {"func": "'n/a' if vm.is_netvm() else\
+            "netvm": {"func": "'n/a' if vm.provides_network else\
                       ('*' if vm.property_is_default('netvm') else '') +\
                         vm_info.netvm if vm_info.netvm is not None "
                               "else '-'"},

qubes/storage/file.py

@@ -212,10 +212,10 @@ class FilePool(Pool):
                              are stored
         """
         # FIX Remove this if we drop the file backend
-        import qubes.vm.templatevm  # nopep8
+        import qubes.vm  # nopep8
         if isinstance(vm, qubes.vm.templatevm.TemplateVM):
             subdir = 'vm-templates'
-        elif vm.is_disposablevm():
+        elif isinstance(vm, qubes.vm.dispvm.DispVM):
             subdir = 'appvms'
             return os.path.join(self.dir_path, subdir,
                                 vm.template.name + '-dvm')

qubes/vm/qubesvm.py

@@ -385,19 +385,6 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
     def conf_file(self):
         return os.path.join(self.dir_path, 'libvirt.xml')
 
-    # XXX I don't know what to do with these; probably should be isinstance(...)
-    def is_disposablevm(self):
-        warnings.warn('vm.is_disposable() is deprecated, use isinstance()',
-            DeprecationWarning)
-        import qubes.vm.dispvm  # pylint: disable=redefined-outer-name
-        return isinstance(self, qubes.vm.dispvm.DispVM)
-
-    def is_netvm(self):
-        warnings.warn('vm.is_netvm() is deprecated, use isinstance()',
-            DeprecationWarning)
-        return isinstance(self, qubes.vm.mix.net.NetVMMixin) \
-               and self.provides_network
-
     # network-related
 
     #