From 22aeb94679edf72d32b3b927fa186bcbe0fc2155 Mon Sep 17 00:00:00 2001
From: Fabrice Salvaire <fabrice.salvaire@orange.fr>
Date: Sat, 22 Dec 2018 20:55:31 +0100
Subject: [PATCH] fixed package directory name

---
 .../GCode}/__init__.py                               |  0
 .../Lex.py => PythonicGCodeMachine/Lexer/__init__.py | 12 ++++++++++--
 .../Machine}/__init__.py                             |  0
 .../Machine/data/make-yaml.py                        |  0
 .../Machine/data/rs274-default-parameter-file.yaml   |  0
 .../Machine/data/rs274-execution-order.yaml          |  0
 .../Machine/data/rs274-gcodes.yaml                   |  0
 .../Machine/data/rs274-modal-groups.yaml             |  0
 .../Machine/data/rs274-word-starting-letter.yaml     |  0
 9 files changed, 10 insertions(+), 2 deletions(-)
 rename {PythonicGcodeMachine/Machine => PythonicGCodeMachine/GCode}/__init__.py (100%)
 rename PythonicGcodeMachine/Lexer/Lex.py => PythonicGCodeMachine/Lexer/__init__.py (99%)
 rename {PythonicGcodeMachine => PythonicGCodeMachine/Machine}/__init__.py (100%)
 rename {PythonicGcodeMachine => PythonicGCodeMachine}/Machine/data/make-yaml.py (100%)
 rename {PythonicGcodeMachine => PythonicGCodeMachine}/Machine/data/rs274-default-parameter-file.yaml (100%)
 rename {PythonicGcodeMachine => PythonicGCodeMachine}/Machine/data/rs274-execution-order.yaml (100%)
 rename {PythonicGcodeMachine => PythonicGCodeMachine}/Machine/data/rs274-gcodes.yaml (100%)
 rename {PythonicGcodeMachine => PythonicGCodeMachine}/Machine/data/rs274-modal-groups.yaml (100%)
 rename {PythonicGcodeMachine => PythonicGCodeMachine}/Machine/data/rs274-word-starting-letter.yaml (100%)

diff --git a/PythonicGcodeMachine/Machine/__init__.py b/PythonicGCodeMachine/GCode/__init__.py
similarity index 100%
rename from PythonicGcodeMachine/Machine/__init__.py
rename to PythonicGCodeMachine/GCode/__init__.py
diff --git a/PythonicGcodeMachine/Lexer/Lex.py b/PythonicGCodeMachine/Lexer/__init__.py
similarity index 99%
rename from PythonicGcodeMachine/Lexer/Lex.py
rename to PythonicGCodeMachine/Lexer/__init__.py
index d669c30..4e02d9c 100644
--- a/PythonicGcodeMachine/Lexer/Lex.py
+++ b/PythonicGCodeMachine/Lexer/__init__.py
@@ -910,8 +910,16 @@ class LexerReflect(object):
 #
 # Build all of the regular expression rules from definitions in the supplied module
 
-def lex(module=None, object=None, debug=False, optimize=False, lextab='lextab',
-        reflags=int(re.VERBOSE), nowarn=False, outputdir=None, debuglog=None, errorlog=None,
+def lex(module=None,
+        object=None,
+        debug=False,
+        optimize=False,
+        lextab='lextab',
+        reflags=int(re.VERBOSE),
+        nowarn=False,
+        outputdir=None,
+        debuglog=None,
+        errorlog=None,
 ):
 
     if lextab is None:
diff --git a/PythonicGcodeMachine/__init__.py b/PythonicGCodeMachine/Machine/__init__.py
similarity index 100%
rename from PythonicGcodeMachine/__init__.py
rename to PythonicGCodeMachine/Machine/__init__.py
diff --git a/PythonicGcodeMachine/Machine/data/make-yaml.py b/PythonicGCodeMachine/Machine/data/make-yaml.py
similarity index 100%
rename from PythonicGcodeMachine/Machine/data/make-yaml.py
rename to PythonicGCodeMachine/Machine/data/make-yaml.py
diff --git a/PythonicGcodeMachine/Machine/data/rs274-default-parameter-file.yaml b/PythonicGCodeMachine/Machine/data/rs274-default-parameter-file.yaml
similarity index 100%
rename from PythonicGcodeMachine/Machine/data/rs274-default-parameter-file.yaml
rename to PythonicGCodeMachine/Machine/data/rs274-default-parameter-file.yaml
diff --git a/PythonicGcodeMachine/Machine/data/rs274-execution-order.yaml b/PythonicGCodeMachine/Machine/data/rs274-execution-order.yaml
similarity index 100%
rename from PythonicGcodeMachine/Machine/data/rs274-execution-order.yaml
rename to PythonicGCodeMachine/Machine/data/rs274-execution-order.yaml
diff --git a/PythonicGcodeMachine/Machine/data/rs274-gcodes.yaml b/PythonicGCodeMachine/Machine/data/rs274-gcodes.yaml
similarity index 100%
rename from PythonicGcodeMachine/Machine/data/rs274-gcodes.yaml
rename to PythonicGCodeMachine/Machine/data/rs274-gcodes.yaml
diff --git a/PythonicGcodeMachine/Machine/data/rs274-modal-groups.yaml b/PythonicGCodeMachine/Machine/data/rs274-modal-groups.yaml
similarity index 100%
rename from PythonicGcodeMachine/Machine/data/rs274-modal-groups.yaml
rename to PythonicGCodeMachine/Machine/data/rs274-modal-groups.yaml
diff --git a/PythonicGcodeMachine/Machine/data/rs274-word-starting-letter.yaml b/PythonicGCodeMachine/Machine/data/rs274-word-starting-letter.yaml
similarity index 100%
rename from PythonicGcodeMachine/Machine/data/rs274-word-starting-letter.yaml
rename to PythonicGCodeMachine/Machine/data/rs274-word-starting-letter.yaml
-- 
GitLab