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
1=== modified file 'extras/explorer.iss'
2--- extras/explorer.iss 2010-02-06 08:21:56 +0000
3+++ extras/explorer.iss 2010-02-06 13:24:14 +0000
4@@ -84,12 +84,10 @@
5 ; using FindFile API
6 Type: files; Name: {app}\*.pyc
7 Type: files; Name: {app}\lib\*.pyc
8-Type: files; Name: {app}\lib\tests\*.pyc
9 Type: files; Name: {app}\tests\*.pyc
10 Type: files; Name: {app}\widgets\*.pyc
11 Type: files; Name: {app}\*.pyo
12 Type: files; Name: {app}\lib\*.pyo
13-Type: files; Name: {app}\lib\tests\*.pyo
14 Type: files; Name: {app}\tests\*.pyo
15 Type: files; Name: {app}\widgets\*.pyo
16
17
18=== removed directory 'lib/tests'
19=== removed file 'lib/tests/__init__.py'
20--- lib/tests/__init__.py 2009-06-09 13:55:27 +0000
21+++ lib/tests/__init__.py 1970-01-01 00:00:00 +0000
22@@ -1,17 +0,0 @@
23-# Copyright (C) 2009 Canonical Ltd
24-#
25-# This program is free software; you can redistribute it and/or modify
26-# it under the terms of the GNU General Public License as published by
27-# the Free Software Foundation; either version 2 of the License, or
28-# (at your option) any later version.
29-#
30-# This program is distributed in the hope that it will be useful,
31-# but WITHOUT ANY WARRANTY; without even the implied warranty of
32-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
33-# GNU General Public License for more details.
34-#
35-# You should have received a copy of the GNU General Public License
36-# along with this program; if not, write to the Free Software
37-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
38-
39-"""Tests for bzr-explorer."""
40
41=== removed file 'lib/tests/menus-in.xml'
42--- lib/tests/menus-in.xml 2009-06-25 03:02:38 +0000
43+++ lib/tests/menus-in.xml 1970-01-01 00:00:00 +0000
44@@ -1,12 +0,0 @@
45-<menu text="Bazaar Menus">
46- <menu text="Bazaar">
47- <action command="echo Foo" text="Foo" />
48- <separator />
49- <action command="echo Bar" text="Bar" />
50- <menu text="Nested">
51- <action command="echo Foo2" text="Foo2" />
52- <separator />
53- <action command="echo Bar2" text="Bar2" />
54- </menu>
55- </menu>
56-</menu>
57
58=== removed file 'lib/tests/menus-out.xml'
59--- lib/tests/menus-out.xml 2009-06-25 03:02:38 +0000
60+++ lib/tests/menus-out.xml 1970-01-01 00:00:00 +0000
61@@ -1,12 +0,0 @@
62-<menu text="Bazaar Menus">
63- <menu text="Bazaar">
64- <action command="echo Foo" text="Foo" />
65- <separator />
66- <action command="echo Bar" text="Bar" />
67- <menu text="Nested">
68- <action command="echo Foo2" text="Foo2" />
69- <separator />
70- <action command="echo Bar2" text="Bar2" />
71- </menu>
72- </menu>
73-</menu>
74
75=== modified file 'setup.py'
76--- setup.py 2010-02-06 08:21:56 +0000
77+++ setup.py 2010-02-06 13:24:14 +0000
78@@ -25,7 +25,6 @@
79 'bzrlib.plugins.explorer.lib',
80 'bzrlib.plugins.explorer.lib.builders',
81 'bzrlib.plugins.explorer.lib.extensions',
82- 'bzrlib.plugins.explorer.lib.tests',
83 'bzrlib.plugins.explorer.tests',
84 'bzrlib.plugins.explorer.widgets',
85 ],

Subscribers

People subscribed via source and target branches