[gedit-latex] Move base.file to root



commit 6efaad6a2c8554ea160742b9b80019b79b8e9a3b
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sat Oct 1 10:39:17 2011 +0200

    Move base.file to root

 latex/Makefile.am            |    1 +
 latex/base/Makefile.am       |    1 -
 latex/base/__init__.py       |    2 +-
 latex/base/action.py         |    2 +-
 latex/base/tabdecorator.py   |    2 +-
 latex/{base => }/file.py     |    0
 latex/latex/dialogs.py       |    2 +-
 latex/latex/editor.py        |    2 +-
 latex/latex/environment.py   |    2 +-
 latex/latex/expander.py      |    2 +-
 latex/latex/inversesearch.py |    2 +-
 latex/latex/model.py         |    2 +-
 latex/latex/outline.py       |    2 +-
 latex/latex/preview.py       |    2 +-
 latex/latex/validator.py     |    2 +-
 latex/latex/views.py         |    2 +-
 latex/tools/postprocess.py   |    2 +-
 latex/windowactivatable.py   |    4 ++--
 18 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/latex/Makefile.am b/latex/Makefile.am
index 1a5a50b..32b2d1e 100644
--- a/latex/Makefile.am
+++ b/latex/Makefile.am
@@ -4,6 +4,7 @@ plugindir = $(libdir)/gedit/plugins/latex
 
 plugin_PYTHON = \
 	appactivatable.py \
+	file.py \
 	gldefs.py \
 	__init__.py \
 	issues.py \
diff --git a/latex/base/Makefile.am b/latex/base/Makefile.am
index 9f38d29..f7a1f2f 100644
--- a/latex/base/Makefile.am
+++ b/latex/base/Makefile.am
@@ -5,7 +5,6 @@ plugin_PYTHON = \
 	completion.py \
 	config.py \
 	editor.py \
-	file.py \
 	__init__.py \
 	job.py \
 	tabdecorator.py \
diff --git a/latex/base/__init__.py b/latex/base/__init__.py
index 878d731..d650521 100644
--- a/latex/base/__init__.py
+++ b/latex/base/__init__.py
@@ -28,7 +28,7 @@ import logging
 
 from gi.repository import Gtk, Gdk
 
-from .file import File
+from ..file import File
 
 LOG = logging.getLogger(__name__)
 
diff --git a/latex/base/action.py b/latex/base/action.py
index d2c2c1f..c95c4ba 100644
--- a/latex/base/action.py
+++ b/latex/base/action.py
@@ -21,7 +21,7 @@
 from uuid import uuid1
 from gi.repository import Gtk, GdkPixbuf
 
-from ..base.file import File
+from ..file import File
 from ..resources import Resources
 
 class GeditLaTeXPlugin_MenuToolAction(Gtk.Action):
diff --git a/latex/base/tabdecorator.py b/latex/base/tabdecorator.py
index 2a2fd24..77498e0 100644
--- a/latex/base/tabdecorator.py
+++ b/latex/base/tabdecorator.py
@@ -30,7 +30,7 @@ import logging
 from gi.repository import Gedit, Gtk, Gio, GObject
 
 from config import EDITORS
-from .file import File
+from ..file import File
 
 # TODO: maybe create ActionDelegate for GeditWindowDecorator
 
diff --git a/latex/base/file.py b/latex/file.py
similarity index 100%
rename from latex/base/file.py
rename to latex/file.py
diff --git a/latex/latex/dialogs.py b/latex/latex/dialogs.py
index 33186cb..22e8f13 100644
--- a/latex/latex/dialogs.py
+++ b/latex/latex/dialogs.py
@@ -33,7 +33,7 @@ from gi.repository import Gtk, GdkPixbuf
 from ..preferences import Preferences
 from ..util import GladeInterface
 from ..resources import Resources
-from ..base.file import File, Folder
+from ..file import File, Folder
 from ..base import Template
 
 from .preview import PreviewRenderer, ImageToolGenerator
diff --git a/latex/latex/editor.py b/latex/latex/editor.py
index b58dc08..2f28187 100644
--- a/latex/latex/editor.py
+++ b/latex/latex/editor.py
@@ -31,7 +31,7 @@ from gi.repository import Gtk, GObject
 from gi.repository import Gdk
 
 from ..base.editor import Editor
-from ..base.file import File
+from ..file import File
 from ..issues import Issue, IIssueHandler
 from ..util import verbose, open_error
 
diff --git a/latex/latex/environment.py b/latex/latex/environment.py
index 4983047..6211c21 100644
--- a/latex/latex/environment.py
+++ b/latex/latex/environment.py
@@ -179,7 +179,7 @@ class TeXResource(object):
 
 from os.path import expanduser
 
-from ..base.file import File
+from ..file import File
 
 
 class Environment(object):
diff --git a/latex/latex/expander.py b/latex/latex/expander.py
index 71d415a..2d4c256 100644
--- a/latex/latex/expander.py
+++ b/latex/latex/expander.py
@@ -24,7 +24,7 @@ latex.expander
 
 from logging import getLogger
 
-from ..base.file import File
+from ..file import File
 from cache import LaTeXDocumentCache
 from parser import Node
 
diff --git a/latex/latex/inversesearch.py b/latex/latex/inversesearch.py
index 2dbde7f..e14d7f2 100644
--- a/latex/latex/inversesearch.py
+++ b/latex/latex/inversesearch.py
@@ -34,7 +34,7 @@ from logging import getLogger
 _log = getLogger("latex.inversesearch")
 
 
-from ..base.file import File
+from ..file import File
 from editor import LaTeXEditor
 
 
diff --git a/latex/latex/model.py b/latex/latex/model.py
index 5853ba3..678b92d 100644
--- a/latex/latex/model.py
+++ b/latex/latex/model.py
@@ -271,7 +271,7 @@ class LanguageModelParser(sax.ContentHandler):
 from copy import deepcopy
 import pickle
 
-from ..base.file import File
+from ..file import File
 
 
 class LanguageModelFactory(object):
diff --git a/latex/latex/outline.py b/latex/latex/outline.py
index 2db5e52..fbd5175 100644
--- a/latex/latex/outline.py
+++ b/latex/latex/outline.py
@@ -77,7 +77,7 @@ class Outline(object):
     def is_ref_command(self, cmd_name):
         return (cmd_name in REF_CMDS) or (cmd_name in self.new_ref_commands) 
 
-from ..base.file import File
+from ..file import File
 from ..preferences import Preferences
 
 
diff --git a/latex/latex/preview.py b/latex/latex/preview.py
index cc66fce..0b08c95 100644
--- a/latex/latex/preview.py
+++ b/latex/latex/preview.py
@@ -22,7 +22,7 @@
 latex.preview
 """
 
-from ..base.file import File
+from ..file import File
 from ..tools import Tool, Job, ToolRunner
 from ..tools.postprocess import RubberPostProcessor, GenericPostProcessor
 from ..issues import MockStructuredIssueHandler
diff --git a/latex/latex/validator.py b/latex/latex/validator.py
index aca8c08..ed9e77f 100644
--- a/latex/latex/validator.py
+++ b/latex/latex/validator.py
@@ -26,7 +26,7 @@ import os.path
 from logging import getLogger
 from os.path import exists
 
-from ..base.file import File
+from ..file import File
 from ..issues import Issue
 from ..util import escape
 
diff --git a/latex/latex/views.py b/latex/latex/views.py
index 106715f..5cef793 100644
--- a/latex/latex/views.py
+++ b/latex/latex/views.py
@@ -33,7 +33,7 @@ from os.path import basename
 
 from ..preferences import Preferences
 from ..base import PanelView
-from ..base.file import File
+from ..file import File
 from ..resources import Resources
 from ..snippetmanager import SnippetManager
 from ..issues import Issue
diff --git a/latex/tools/postprocess.py b/latex/tools/postprocess.py
index 8af4d02..2ed3ec7 100644
--- a/latex/tools/postprocess.py
+++ b/latex/tools/postprocess.py
@@ -188,7 +188,7 @@ class RubberPostProcessor(PostProcessor):
         return self._summary
 
     def process(self, file, stdout, stderr, condition):
-        from ..base.file import File        # FIXME: this produces a circ dep on toplevel
+        from ..file import File        # FIXME: this produces a circ dep on toplevel
 
         self._issues = []
 
diff --git a/latex/windowactivatable.py b/latex/windowactivatable.py
index 65a9731..75e6de4 100644
--- a/latex/windowactivatable.py
+++ b/latex/windowactivatable.py
@@ -31,11 +31,11 @@ from .preferences import Preferences
 from .preferences.dialog import PreferencesDialog
 from .preferences.tools import ToolPreferences
 from .tools import ToolAction
+from .resources import Resources
+from .file import File
 from .base.config import EDITOR_SCOPE_VIEWS, ACTIONS
 from .base.tabdecorator import GeditTabDecorator
-from .resources import Resources
 from .base import PanelView, WindowContext
-from .base.file import File
 
 LOG = logging.getLogger(__name__)
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]