Merge lp:~bialix/bzr-explorer/outdate into lp:bzr-explorer

Proposed by Alexander Belchenko
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bialix/bzr-explorer/outdate
Merge into: lp:bzr-explorer
Diff against target: 85 lines (+0/-44)
5 files modified
extras/explorer.iss (+0/-2)
lib/tests/__init__.py (+0/-17)
lib/tests/menus-in.xml (+0/-12)
lib/tests/menus-out.xml (+0/-12)
setup.py (+0/-1)
To merge this branch: bzr merge lp:~bialix/bzr-explorer/outdate
Reviewer Review Type Date Requested Status
Ian Clatworthy Approve
Review via email: mp+18756@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Belchenko (bialix) wrote :

Removed unused files from lib/tests directory and directory itself. I did not found any place where these files used now.

Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

Thanks. Please merge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'extras/explorer.iss'
--- extras/explorer.iss 2010-02-06 08:21:56 +0000
+++ extras/explorer.iss 2010-02-06 13:24:14 +0000
@@ -84,12 +84,10 @@
84; using FindFile API84; using FindFile API
85Type: files; Name: {app}\*.pyc85Type: files; Name: {app}\*.pyc
86Type: files; Name: {app}\lib\*.pyc86Type: files; Name: {app}\lib\*.pyc
87Type: files; Name: {app}\lib\tests\*.pyc
88Type: files; Name: {app}\tests\*.pyc87Type: files; Name: {app}\tests\*.pyc
89Type: files; Name: {app}\widgets\*.pyc88Type: files; Name: {app}\widgets\*.pyc
90Type: files; Name: {app}\*.pyo89Type: files; Name: {app}\*.pyo
91Type: files; Name: {app}\lib\*.pyo90Type: files; Name: {app}\lib\*.pyo
92Type: files; Name: {app}\lib\tests\*.pyo
93Type: files; Name: {app}\tests\*.pyo91Type: files; Name: {app}\tests\*.pyo
94Type: files; Name: {app}\widgets\*.pyo92Type: files; Name: {app}\widgets\*.pyo
9593
9694
=== removed directory 'lib/tests'
=== removed file 'lib/tests/__init__.py'
--- lib/tests/__init__.py 2009-06-09 13:55:27 +0000
+++ lib/tests/__init__.py 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
1# Copyright (C) 2009 Canonical Ltd
2#
3# This program is free software; you can redistribute it and/or modify
4# it under the terms of the GNU General Public License as published by
5# the Free Software Foundation; either version 2 of the License, or
6# (at your option) any later version.
7#
8# This program is distributed in the hope that it will be useful,
9# but WITHOUT ANY WARRANTY; without even the implied warranty of
10# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11# GNU General Public License for more details.
12#
13# You should have received a copy of the GNU General Public License
14# along with this program; if not, write to the Free Software
15# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
17"""Tests for bzr-explorer."""
180
=== removed file 'lib/tests/menus-in.xml'
--- lib/tests/menus-in.xml 2009-06-25 03:02:38 +0000
+++ lib/tests/menus-in.xml 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1<menu text="Bazaar Menus">
2 <menu text="Bazaar">
3 <action command="echo Foo" text="Foo" />
4 <separator />
5 <action command="echo Bar" text="Bar" />
6 <menu text="Nested">
7 <action command="echo Foo2" text="Foo2" />
8 <separator />
9 <action command="echo Bar2" text="Bar2" />
10 </menu>
11 </menu>
12</menu>
130
=== removed file 'lib/tests/menus-out.xml'
--- lib/tests/menus-out.xml 2009-06-25 03:02:38 +0000
+++ lib/tests/menus-out.xml 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1<menu text="Bazaar Menus">
2 <menu text="Bazaar">
3 <action command="echo Foo" text="Foo" />
4 <separator />
5 <action command="echo Bar" text="Bar" />
6 <menu text="Nested">
7 <action command="echo Foo2" text="Foo2" />
8 <separator />
9 <action command="echo Bar2" text="Bar2" />
10 </menu>
11 </menu>
12</menu>
130
=== modified file 'setup.py'
--- setup.py 2010-02-06 08:21:56 +0000
+++ setup.py 2010-02-06 13:24:14 +0000
@@ -25,7 +25,6 @@
25 'bzrlib.plugins.explorer.lib',25 'bzrlib.plugins.explorer.lib',
26 'bzrlib.plugins.explorer.lib.builders',26 'bzrlib.plugins.explorer.lib.builders',
27 'bzrlib.plugins.explorer.lib.extensions',27 'bzrlib.plugins.explorer.lib.extensions',
28 'bzrlib.plugins.explorer.lib.tests',
29 'bzrlib.plugins.explorer.tests',28 'bzrlib.plugins.explorer.tests',
30 'bzrlib.plugins.explorer.widgets',29 'bzrlib.plugins.explorer.widgets',
31 ],30 ],

Subscribers

People subscribed via source and target branches