Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Split Find in Files module #4569

Merged
merged 7 commits into from
Jul 26, 2017
Merged

PR: Split Find in Files module #4569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
430a363
Move findinfiles to a module.
rlaverde Jun 6, 2017
c47cb09
Change import after moving findinfiles.
rlaverde Jun 6, 2017
12f4261
Add init to findinfilesmodule.
rlaverde Jun 6, 2017
c33b53a
Move findinfiles widgets.
rlaverde Jun 6, 2017
54a8c0b
Change imports after moving findinfiles widgets.
rlaverde Jun 6, 2017
d27cb05
Move findinfile tests.
rlaverde Jun 6, 2017
3983512
Move findinfiles tests data.
rlaverde Jun 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spyder/app/mainwindow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ def create_edit_action(text, tr_text, icon):

# Find in files
if CONF.get('find_in_files', 'enable'):
from spyder.plugins.findinfiles import FindInFiles
from spyder.plugins.findinfiles.plugin import FindInFiles
self.findinfiles = FindInFiles(self)
self.findinfiles.register_plugin()

Expand Down
12 changes: 12 additions & 0 deletions spyder/plugins/findinfiles/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# -*- coding: utf-8 -*-
#
# Copyright © Spyder Project Contributors
# Licensed under the terms of the MIT License
# (see spyder/__init__.py for details)

"""
spyder.plugins.findinfiles.plugin.plugin
===========

Find in files plugin.
"""
2 changes: 1 addition & 1 deletion spyder/plugins/findinfiles.py → spyder/plugins/findinfiles/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from spyder.py3compat import getcwd
from spyder.utils import icon_manager as ima
from spyder.utils.qthelpers import create_action, MENU_SEPARATOR
from spyder.widgets.findinfiles import FindInFilesWidget
from spyder.plugins.findinfiles.widgets import FindInFilesWidget


class FindInFiles(SpyderPluginWidget):
Expand Down
0 spyder/widgets/tests/data/spam.cpp → ...r/plugins/findinfiles/tests/data/spam.cpp
View file
Open in desktop
File renamed without changes.
0 spyder/widgets/tests/data/spam.py → ...er/plugins/findinfiles/tests/data/spam.py
View file
Open in desktop
File renamed without changes.
0 spyder/widgets/tests/data/spam.txt → ...r/plugins/findinfiles/tests/data/spam.txt
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions spyder/widgets/tests/test_findinfiles.py → ...ins/findinfiles/tests/test_findinfiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
from pytestqt import qtbot

# Local imports
import spyder.widgets.findinfiles
from spyder.widgets.findinfiles import FindInFilesWidget
from spyder.plugins.findinfiles.widgets import FindInFilesWidget

LOCATION = os.path.realpath(os.path.join(os.getcwd(),
os.path.dirname(__file__)))
Expand Down
0 spyder/widgets/findinfiles.py → spyder/plugins/findinfiles/widgets.py
View file
Open in desktop
File renamed without changes.