From f58789e4df7e929ad474ff8f684becb962ea8ea4 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Thu, 30 Apr 2015 10:44:14 +0200 Subject: [PATCH] [OE-Drucken] Fixed duplicate name Signed-off-by: Jim Martens --- oe/Drucken/oeprint/config.py | 4 ++-- oe/Drucken/oeprint/{config => configuration}/config.json | 0 oe/Drucken/oeprint/oeprint.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename oe/Drucken/oeprint/{config => configuration}/config.json (100%) diff --git a/oe/Drucken/oeprint/config.py b/oe/Drucken/oeprint/config.py index be56f14..bd49738 100644 --- a/oe/Drucken/oeprint/config.py +++ b/oe/Drucken/oeprint/config.py @@ -21,8 +21,8 @@ class Config: def load_json_file(self): """ - Loads the JSON config file - :type self: oeprint.config.Config + Loads the JSON configuration file + :type self: config.Config :rtype : object """ file = open(self.config_file, 'r', encoding='utf-8') diff --git a/oe/Drucken/oeprint/config/config.json b/oe/Drucken/oeprint/configuration/config.json similarity index 100% rename from oe/Drucken/oeprint/config/config.json rename to oe/Drucken/oeprint/configuration/config.json diff --git a/oe/Drucken/oeprint/oeprint.py b/oe/Drucken/oeprint/oeprint.py index 574d24a..f95d1bf 100755 --- a/oe/Drucken/oeprint/oeprint.py +++ b/oe/Drucken/oeprint/oeprint.py @@ -16,7 +16,7 @@ def main(): parser.add_argument('prints', metavar='numberOfPrints', type=int, help='how often the build is printed') parser.add_argument('--printer', dest='printer', help='a valid printer name like d116_sw', default='d116_sw') arguments = parser.parse_args() - config = Config('config/config.json') + config = Config('configuration/config.json') build_data = config.load_build(arguments.build) print(build_data) # TODO add actual functionality