further restructuring of flashtool

tools/flashtool/flasher.py

@@ -1,7 +1,9 @@
-
-import flashtool.esptool as esptool
+try:
+    import esptool
+except:
+    import flashtool.esptool as esptool
 import os
-from flashtool.version import VERSION
+VERSION="2.1"
 
 class Flasher():
     def getVersion(self):

tools/flashtool/flashtool.py

@@ -26,7 +26,7 @@ class MyFinder(importlib.abc.MetaPathFinder):
    def find_spec(self,fullname, path, target=None):
        if fullname == self.pkg:
             if self.debug:
-                print("F:matching %"%fullname)
+                print("F:matching %s"%fullname)
             spec=importlib.util.spec_from_file_location(fullname, self.dir,loader=MyLoader(), submodule_search_locations=[self.dir])
             if self.debug:
                 print("F:injecting:",spec)

tools/flashtool/version.py

@@ -1 +0,0 @@
-VERSION="2.1"