From 209e2a23e9b82ecf5e317932cb03019e6f37afac Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Fri, 30 Oct 2020 16:44:15 +0300 Subject: [PATCH] Extra dependency removed --- cppclasshelper.py | 20 +++++++++++--------- dependencies.json | 7 ------- template.py | 8 +++++--- 3 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 dependencies.json diff --git a/cppclasshelper.py b/cppclasshelper.py index 9393aac..4dabd51 100644 --- a/cppclasshelper.py +++ b/cppclasshelper.py @@ -1,5 +1,6 @@ import sublime, sublime_plugin, os -from sublime_lib import ResourcePath +import os.path + from .method_generator.exceptions import ClassValidationException from .method_generator.generator import Generator @@ -12,11 +13,12 @@ class for create a C++ class with a sourcefile and headerfile def run(self, **kwargs): # plugin settings - self.package_dir = ResourcePath.from_file_path(__file__).parent + self.package_dir = os.path.dirname(os.path.abspath(__file__)) + "\\" + + self.plugin_name = 'C++ Classhelper' - self.template_dir_name = 'templates' - # self.template_dir = "{}/{}/".format(self.package_dir, self.template_dir_name) - self.template_dir = self.package_dir / self.template_dir_name + self.template_dir_name = 'templates\\' + self.template_dir = self.package_dir + self.template_dir_name # global settings self.settings = sublime.load_settings("C++ Classhelper.sublime-settings") @@ -51,13 +53,13 @@ def create_class(self, class_name): header_template = Template("C++ Header Style") try: - source_file_template.load(self.template_dir / 'sourcefile.template') - header_file_template.load(self.template_dir / 'headerfile.template') + source_file_template.load(self.template_dir + 'sourcefile.template') + header_file_template.load(self.template_dir + 'headerfile.template') if self.settings.get('use_pragma_once'): - header_template.load(self.template_dir / 'header-new.template') + header_template.load(self.template_dir + 'header-new.template') else: - header_template.load(self.template_dir / 'header-old.template') + header_template.load(self.template_dir + 'header-old.template') except OSError as e: sublime.error_message("Error while loading class template: {}".format(str(e))) diff --git a/dependencies.json b/dependencies.json deleted file mode 100644 index f38c32c..0000000 --- a/dependencies.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "*": { - "*": [ - "sublime_lib" - ] - } -} \ No newline at end of file diff --git a/template.py b/template.py index 21f4fe3..06c8be4 100644 --- a/template.py +++ b/template.py @@ -5,15 +5,17 @@ class Template: def __init__(self, name): self._template = None self._name = name - self._filename = None + self.file = None def load(self, filename): # load template file - self._filename = str(filename) + self.file = open(filename) # reading template - self._template = filename.read_text() + self._template = self.file.read() + + self.file.close() def render(self, **values):