[Commit-gnuradio] [gnuradio] 06/18: grc-refactor: rename grc/model/ to grc/core/

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 412df3a17ec35277f5a1d2f21c6f9a287f9ef8ad
Author: Sebastian Koslowski <address@hidden>
Date:   Thu Feb 4 17:27:21 2016 +0100

    grc-refactor: rename grc/model/ to grc/core/
---
 grc/{model => core}/Block.py                  | 0
 grc/{model => core}/CMakeLists.txt            | 0
 grc/{model => core}/Connection.py             | 0
 grc/{model => core}/Constants.py              | 0
 grc/{model => core}/Element.py                | 0
 grc/{model => core}/FlowGraph.py              | 0
 grc/{model => core}/Param.py                  | 0
 grc/{model => core}/ParseXML.py               | 0
 grc/{model => core}/Platform.py               | 0
 grc/{model => core}/Port.py                   | 0
 grc/{model => core}/__init__.py               | 0
 grc/{model => core}/block.dtd                 | 0
 grc/{model => core}/block_tree.dtd            | 0
 grc/{model => core}/default_flow_graph.grc    | 0
 grc/{model => core}/domain.dtd                | 0
 grc/{model => core}/epy_block_io.py           | 0
 grc/{model => core}/expr_utils.py             | 0
 grc/{model => core}/extract_docs.py           | 0
 grc/{model => core}/flow_graph.dtd            | 0
 grc/{model => core}/generator/Generator.py    | 2 +-
 grc/{model => core}/generator/__init__.py     | 0
 grc/{model => core}/generator/flow_graph.tmpl | 0
 grc/{model => core}/odict.py                  | 0
 grc/{model => core}/utils/__init__.py         | 0
 grc/{model => core}/utils/complexity.py       | 0
 grc/gui/ActionHandler.py                      | 4 ++--
 grc/gui/Block.py                              | 8 ++++----
 grc/gui/Connection.py                         | 4 ++--
 grc/gui/FlowGraph.py                          | 2 +-
 grc/gui/Param.py                              | 2 +-
 grc/gui/Platform.py                           | 4 ++--
 grc/gui/Port.py                               | 4 ++--
 32 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/grc/model/Block.py b/grc/core/Block.py
similarity index 100%
rename from grc/model/Block.py
rename to grc/core/Block.py
diff --git a/grc/model/CMakeLists.txt b/grc/core/CMakeLists.txt
similarity index 100%
rename from grc/model/CMakeLists.txt
rename to grc/core/CMakeLists.txt
diff --git a/grc/model/Connection.py b/grc/core/Connection.py
similarity index 100%
rename from grc/model/Connection.py
rename to grc/core/Connection.py
diff --git a/grc/model/Constants.py b/grc/core/Constants.py
similarity index 100%
rename from grc/model/Constants.py
rename to grc/core/Constants.py
diff --git a/grc/model/Element.py b/grc/core/Element.py
similarity index 100%
rename from grc/model/Element.py
rename to grc/core/Element.py
diff --git a/grc/model/FlowGraph.py b/grc/core/FlowGraph.py
similarity index 100%
rename from grc/model/FlowGraph.py
rename to grc/core/FlowGraph.py
diff --git a/grc/model/Param.py b/grc/core/Param.py
similarity index 100%
rename from grc/model/Param.py
rename to grc/core/Param.py
diff --git a/grc/model/ParseXML.py b/grc/core/ParseXML.py
similarity index 100%
rename from grc/model/ParseXML.py
rename to grc/core/ParseXML.py
diff --git a/grc/model/Platform.py b/grc/core/Platform.py
similarity index 100%
rename from grc/model/Platform.py
rename to grc/core/Platform.py
diff --git a/grc/model/Port.py b/grc/core/Port.py
similarity index 100%
rename from grc/model/Port.py
rename to grc/core/Port.py
diff --git a/grc/model/__init__.py b/grc/core/__init__.py
similarity index 100%
rename from grc/model/__init__.py
rename to grc/core/__init__.py
diff --git a/grc/model/block.dtd b/grc/core/block.dtd
similarity index 100%
rename from grc/model/block.dtd
rename to grc/core/block.dtd
diff --git a/grc/model/block_tree.dtd b/grc/core/block_tree.dtd
similarity index 100%
rename from grc/model/block_tree.dtd
rename to grc/core/block_tree.dtd
diff --git a/grc/model/default_flow_graph.grc b/grc/core/default_flow_graph.grc
similarity index 100%
rename from grc/model/default_flow_graph.grc
rename to grc/core/default_flow_graph.grc
diff --git a/grc/model/domain.dtd b/grc/core/domain.dtd
similarity index 100%
rename from grc/model/domain.dtd
rename to grc/core/domain.dtd
diff --git a/grc/model/epy_block_io.py b/grc/core/epy_block_io.py
similarity index 100%
rename from grc/model/epy_block_io.py
rename to grc/core/epy_block_io.py
diff --git a/grc/model/expr_utils.py b/grc/core/expr_utils.py
similarity index 100%
rename from grc/model/expr_utils.py
rename to grc/core/expr_utils.py
diff --git a/grc/model/extract_docs.py b/grc/core/extract_docs.py
similarity index 100%
rename from grc/model/extract_docs.py
rename to grc/core/extract_docs.py
diff --git a/grc/model/flow_graph.dtd b/grc/core/flow_graph.dtd
similarity index 100%
rename from grc/model/flow_graph.dtd
rename to grc/core/flow_graph.dtd
diff --git a/grc/model/generator/Generator.py b/grc/core/generator/Generator.py
similarity index 99%
rename from grc/model/generator/Generator.py
rename to grc/core/generator/Generator.py
index 27cb24a..b1fb73b 100644
--- a/grc/model/generator/Generator.py
+++ b/grc/core/generator/Generator.py
@@ -31,7 +31,7 @@ from Cheetah.Template import Template
 from .. import ParseXML, expr_utils
 from ..odict import odict
 
-from grc.model.Constants import (
+from ..Constants import (
     TOP_BLOCK_FILE_MODE, BLOCK_FLAG_NEED_QT_GUI,
     XTERM_EXECUTABLE, HIER_BLOCK_FILE_MODE, HIER_BLOCKS_LIB_DIR, BLOCK_DTD
 )
diff --git a/grc/model/generator/__init__.py b/grc/core/generator/__init__.py
similarity index 100%
rename from grc/model/generator/__init__.py
rename to grc/core/generator/__init__.py
diff --git a/grc/model/generator/flow_graph.tmpl 
b/grc/core/generator/flow_graph.tmpl
similarity index 100%
rename from grc/model/generator/flow_graph.tmpl
rename to grc/core/generator/flow_graph.tmpl
diff --git a/grc/model/odict.py b/grc/core/odict.py
similarity index 100%
rename from grc/model/odict.py
rename to grc/core/odict.py
diff --git a/grc/model/utils/__init__.py b/grc/core/utils/__init__.py
similarity index 100%
rename from grc/model/utils/__init__.py
rename to grc/core/utils/__init__.py
diff --git a/grc/model/utils/complexity.py b/grc/core/utils/complexity.py
similarity index 100%
rename from grc/model/utils/complexity.py
rename to grc/core/utils/complexity.py
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py
index b219ed2..6a93574 100644
--- a/grc/gui/ActionHandler.py
+++ b/grc/gui/ActionHandler.py
@@ -28,8 +28,8 @@ import gtk
 import gobject
 
 
-from ..model import Constants, ParseXML
-from .. model.Constants import XTERM_EXECUTABLE
+from ..core import Constants, ParseXML
+from .. core.Constants import XTERM_EXECUTABLE
 
 from . import Dialogs, Messages, Preferences, Actions
 from .ParserErrorsDialog import ParserErrorsDialog
diff --git a/grc/gui/Block.py b/grc/gui/Block.py
index 2439c32..9d718bc 100644
--- a/grc/gui/Block.py
+++ b/grc/gui/Block.py
@@ -30,10 +30,10 @@ from .Constants import (
     BORDER_PROXIMITY_SENSITIVITY
 )
 from . Element import Element
-from ..model.odict import odict
-from ..model.Param import num_to_str
-from ..model.utils.complexity import calculate_flowgraph_complexity
-from ..model.Block import Block as _Block
+from ..core.odict import odict
+from ..core.Param import num_to_str
+from ..core.utils.complexity import calculate_flowgraph_complexity
+from ..core.Block import Block as _Block
 
 BLOCK_MARKUP_TMPL="""\
 #set $foreground = $block.is_valid() and 'black' or 'red'
diff --git a/grc/gui/Connection.py b/grc/gui/Connection.py
index d248543..733c6b7 100644
--- a/grc/gui/Connection.py
+++ b/grc/gui/Connection.py
@@ -24,8 +24,8 @@ import Utils
 from Constants import CONNECTOR_ARROW_BASE, CONNECTOR_ARROW_HEIGHT
 from Element import Element
 
-from ..model.Constants import GR_MESSAGE_DOMAIN
-from ..model.Connection import Connection as _Connection
+from ..core.Constants import GR_MESSAGE_DOMAIN
+from ..core.Connection import Connection as _Connection
 
 
 class Connection(Element, _Connection):
diff --git a/grc/gui/FlowGraph.py b/grc/gui/FlowGraph.py
index 0c66a7e..28fc48f 100644
--- a/grc/gui/FlowGraph.py
+++ b/grc/gui/FlowGraph.py
@@ -30,7 +30,7 @@ from . Element import Element
 from . Constants import SCROLL_PROXIMITY_SENSITIVITY, SCROLL_DISTANCE
 from . external_editor import ExternalEditor
 
-from ..model.FlowGraph import FlowGraph as _Flowgraph
+from ..core.FlowGraph import FlowGraph as _Flowgraph
 
 
 class FlowGraph(Element, _Flowgraph):
diff --git a/grc/gui/Param.py b/grc/gui/Param.py
index fed747b..647e817 100644
--- a/grc/gui/Param.py
+++ b/grc/gui/Param.py
@@ -26,7 +26,7 @@ import gtk
 from . import Colors, Utils, Constants, Dialogs
 from .Element import Element
 
-from ..model.Param import Param as _Param
+from ..core.Param import Param as _Param
 
 
 class InputParam(gtk.HBox):
diff --git a/grc/gui/Platform.py b/grc/gui/Platform.py
index af54e49..793065b 100644
--- a/grc/gui/Platform.py
+++ b/grc/gui/Platform.py
@@ -22,8 +22,8 @@ import sys
 
 from .Element import Element
 
-from ..model.Platform import Platform as _Platform
-from ..model.Constants import PREFS_FILE, PREFS_FILE_OLD
+from ..core.Platform import Platform as _Platform
+from ..core.Constants import PREFS_FILE, PREFS_FILE_OLD
 
 from .Block import Block as _Block
 from .FlowGraph import FlowGraph as _FlowGraph
diff --git a/grc/gui/Port.py b/grc/gui/Port.py
index c281cbd..6314b7e 100644
--- a/grc/gui/Port.py
+++ b/grc/gui/Port.py
@@ -27,9 +27,9 @@ from .Constants import (
     CONNECTOR_EXTENSION_INCREMENT, PORT_LABEL_PADDING, PORT_MIN_WIDTH, 
PORT_LABEL_HIDDEN_WIDTH, PORT_FONT
 )
 from .Element import Element
-from ..model.Constants import DEFAULT_DOMAIN, GR_MESSAGE_DOMAIN
+from ..core.Constants import DEFAULT_DOMAIN, GR_MESSAGE_DOMAIN
 
-from ..model.Port import Port as _Port
+from ..core.Port import Port as _Port
 
 PORT_MARKUP_TMPL="""\
 <span foreground="black" font_desc="$font">$encode($port.get_name())</span>"""