[Reportbug-commits] r569 - in branches/modules (28 files)
lawrencc at users.alioth.debian.org
lawrencc at users.alioth.debian.org
Tue Jul 8 19:13:42 UTC 2008
Date: Tuesday, July 8, 2008 @ 19:13:40
Author: lawrencc
Revision: 569
Push remaining patches from modularization branch
0010-Update-paths-for-modularization.patch
0011-Bump-version-more-cleanups-for-tree-rearrangement.patch
0012-Transition-to-setuptools-from-distutils.patch
0013-Update-Python-path-to-skip-usr-share-reportbug.patch
0014-Fix-paths-for-import.patch
0015-Update-UI-import-checks.patch
0016-Update-paths-for-modularization.patch
0017-Update-version-test-for-new-tree-layout.patch
0018-Add-info-on-README.Users-and-pressing-q-to-presubj.patch
0019-Split-README.developers-into-documentation-for-Debia.patch
0020-Update-path-for-debianbts.py.patch
0021-Update-imports-for-modularized-structure-of-reportbu.patch
0022-Describe-the-checks-directory.patch
0023-Creating-modularization-branch.patch
Added:
branches/modules/README.source
Modified:
branches/modules/README.developers
branches/modules/bin/querybts
branches/modules/bin/reportbug
branches/modules/checks/compare_pseudo-pkgs_lists.py
branches/modules/debian/control
branches/modules/debian/rules
branches/modules/presubj
branches/modules/reportbug/__init__.py
branches/modules/reportbug/checkversions.py
branches/modules/reportbug/submit.py
branches/modules/reportbug/ui/text.py
branches/modules/reportbug/ui/urwid.py
branches/modules/reportbug/urlutils.py
branches/modules/reportbug/utils.py
branches/modules/test/scaffold.py
branches/modules/test/test_checkbuildd.py
branches/modules/test/test_checkversions.py
branches/modules/test/test_debianbts.py
branches/modules/test/test_hiermatch.py
branches/modules/test/test_rbtempfile.py
branches/modules/test/test_reportbug.py
branches/modules/test/test_reportbug_exceptions.py
branches/modules/test/test_reportbug_submit.py
branches/modules/test/test_reportbug_ui_newt.py
branches/modules/test/test_reportbug_ui_text.py
branches/modules/test/test_reportbug_ui_urwid.py
branches/modules/test/test_urlutils.py
Modified: branches/modules/README.developers
===================================================================
--- branches/modules/README.developers 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/README.developers 2008-07-08 19:13:40 UTC (rev 569)
@@ -107,99 +107,6 @@
written using /bin/bash as their interpreter; for other shells or
languages, you will need to write your own input parsing functions.
-Source layout
-=============
-
-The source tree for ``reportbug`` is organised this way:
-
-* Top level
-
- * Programs (e.g. ``reportbug``, ``querybts``, etc.).
-
- * Python library modules, used by the programs.
-
- * Manual pages.
-
-* Debian packaging
-
- * ``debian/`` contains the control files used to build the Debian
- source and binary packages.
-
-* `Unit testing framework`_
-
- * ``test/`` contains the unit test suite. Unit test modules are
- discovered and run using the ``nosetests`` program, and are named
- as ``test_*.py``.
-
-* ?? TODO: describe the purpose
-
- * ``checks/`` contains ???
-
-* Internationalisation and localisation
-
- * ``po4a/`` contains configuration and data for localisation of
- source files using the ``po4a`` tool.
-
-Unit testing framework
-======================
-
-The reportbug source package now has a unit testing framework.
-
-The directory ``test/`` contains unit test modules and supporting
-files. New unit test modules should be added to this directory and
-named ``test_*.py``.
-
-The unit test suite depends on the `python-nose` package being
-installed, to make the ``nosetests`` command available. The unit tests
-themselves can be written using either the `unittest` or `doctest`
-modules in the standard Python library.
-
-The `scaffold` module (from the ``test/scaffold.py`` file) contains
-some helper functionality for unit tests, including an extended
-`TestCase` class.
-
-``make`` targets for testing and quality checks
------------------------------------------------
-
-The following ``make`` targets are useful for testing and related
-tasks.
-
-* ``make test`` runs the unit test suite, preceded by a timestamp
- banner, and reports any test failures or "OK" if all tests pass.
-
-* ``make test-continuous`` starts a loop which clears the screen, runs
- ``make test``, then waits for any of the tests or source code to
- change, and starts the loop again.
-
- This is useful to run in a separate terminal during a development
- session, so that whenever a change is made the test suite will be
- run automatically. You might want to keep the window hidden while
- actually editing files, and only look at it when you've created or
- modified a file and want to check its effect on the test run.
-
- This uses the ``inotifywait`` command from the `inotify-tools`
- package to wait for `create` and `modify` events.
-
-* ``make coverage`` runs the test suite and collects test coverage
- information, then reports the current statement coverage of the test
- suite.
-
- This requires the `python-coverage` package to be installed. See its
- documentation for more about its operation.
-
-* ``make pyflakes`` runs the `pyflakes` static code checker on all
- Python files found in the project tree.
-
- This requires the `pyflakes` package to be installed. See its
- documentation for more about its operation.
-
-* ``make pylint`` runs the `pylint` code checker on all code modules
- and programs.
-
- This requires the `pylint` package to be installed. See its
- documentation for more about its operation.
-
-
..
Local Variables:
coding: utf-8
Added: branches/modules/README.source
===================================================================
--- branches/modules/README.source (rev 0)
+++ branches/modules/README.source 2008-07-08 19:13:40 UTC (rev 569)
@@ -0,0 +1,106 @@
+Source layout
+=============
+
+The source tree for ``reportbug`` is organised this way:
+
+* Top level
+
+ * Manual pages.
+
+* Debian packaging
+
+ * ``debian/`` contains the control files used to build the Debian
+ source and binary packages.
+
+* `Programs`_
+
+ * ``bin/`` contains the end-user programs (e.g. ``reportbug``,
+ ``querybts``).
+
+* `Libraries`_
+
+ * ``reportbug/`` contains the Python library module package used by
+ the programs.
+
+* `Unit testing framework`_
+
+ * ``test/`` contains the unit test suite. Unit test modules are
+ discovered and run using the ``nosetests`` program, and are named
+ as ``test_*.py``.
+
+* `Internal checking framework`_
+
+ * ``checks/`` contains various scripts that ensure reportbug's
+ internals are up-to-date with the Debian BTS.
+
+* Internationalisation and localisation
+
+ * ``po4a/`` contains configuration and data for localisation of
+ source files using the ``po4a`` tool.
+
+Unit testing framework
+======================
+
+The reportbug source package now has a unit testing framework.
+
+The directory ``test/`` contains unit test modules and supporting
+files. New unit test modules should be added to this directory and
+named ``test_*.py``.
+
+The unit test suite depends on the `python-nose` package being
+installed, to make the ``nosetests`` command available. The unit tests
+themselves can be written using either the `unittest` or `doctest`
+modules in the standard Python library.
+
+The `scaffold` module (from the ``test/scaffold.py`` file) contains
+some helper functionality for unit tests, including an extended
+`TestCase` class.
+
+``make`` targets for testing and quality checks
+-----------------------------------------------
+
+The following ``make`` targets are useful for testing and related
+tasks.
+
+* ``make test`` runs the unit test suite, preceded by a timestamp
+ banner, and reports any test failures or "OK" if all tests pass.
+
+* ``make test-continuous`` starts a loop which clears the screen, runs
+ ``make test``, then waits for any of the tests or source code to
+ change, and starts the loop again.
+
+ This is useful to run in a separate terminal during a development
+ session, so that whenever a change is made the test suite will be
+ run automatically. You might want to keep the window hidden while
+ actually editing files, and only look at it when you've created or
+ modified a file and want to check its effect on the test run.
+
+ This uses the ``inotifywait`` command from the `inotify-tools`
+ package to wait for `create` and `modify` events.
+
+* ``make coverage`` runs the test suite and collects test coverage
+ information, then reports the current statement coverage of the test
+ suite.
+
+ This requires the `python-coverage` package to be installed. See its
+ documentation for more about its operation.
+
+* ``make pyflakes`` runs the `pyflakes` static code checker on all
+ Python files found in the project tree.
+
+ This requires the `pyflakes` package to be installed. See its
+ documentation for more about its operation.
+
+* ``make pylint`` runs the `pylint` code checker on all code modules
+ and programs.
+
+ This requires the `pylint` package to be installed. See its
+ documentation for more about its operation.
+
+
+..
+ Local Variables:
+ coding: utf-8
+ mode: rst
+ End:
+ vim: filetype=rst :
Modified: branches/modules/bin/querybts
===================================================================
--- branches/modules/bin/querybts 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/bin/querybts 2008-07-08 19:13:40 UTC (rev 569)
@@ -2,7 +2,7 @@
# -*- python -*-
# querybts - Examine the state of a debbugs server
# Written by Chris Lawrence <lawrencc at debian.org>
-# (C) 1999-2006 Chris Lawrence
+# (C) 1999-2008 Chris Lawrence
#
# This program is freely distributable per the following license:
#
@@ -24,25 +24,24 @@
#
# $Id: querybts,v 1.7.2.3 2008-04-18 05:38:27 lawrencc Exp $
-import sys, os
-sys.path = ['/usr/share/reportbug'] + sys.path
-
+import sys
+import os
import getopt
import re
-from reportbuglib import reportbug
-from reportbuglib.reportbug_exceptions import (
+from reportbug import utils
+from reportbug.exceptions import (
UINotImportable,
NoPackage, NoBugs, NoReport, NoNetwork,
)
-from reportbuglib import debianbts
-from reportbuglib import urlutils
+from reportbug import debianbts
+from reportbug import urlutils
try:
- from reportbuglib import reportbug_ui_newt as ui
+ import reportbug.ui.newt as ui
ui_mode = 'newt'
except:
- from reportbuglib import reportbug_ui_text as ui
+ import reportbug.ui.text as ui
ui_mode = 'text'
VERSION = "querybts ##VERSION##"
@@ -67,7 +66,7 @@
mirrors = None
mbox = False
- args = reportbug.parse_config_files()
+ args = utils.parse_config_files()
for option, arg in args.items():
if option == 'system':
system = arg
@@ -105,7 +104,7 @@
elif option in ('-s', '--source'):
source = True
elif option in ('-u', '--ui', '--interface'):
- if arg in reportbug.AVAILABLE_UIS:
+ if arg in utils.AVAILABLE_UIS:
interface = arg
elif arg == 'help':
print 'Permitted arguments to --ui:\n'\
Modified: branches/modules/bin/reportbug
===================================================================
--- branches/modules/bin/reportbug 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/bin/reportbug 2008-07-08 19:13:40 UTC (rev 569)
@@ -27,9 +27,8 @@
DEBUGGER = 'lawrencc at debian.org'
DEFAULT_BTS = 'debian'
-import sys, os
-sys.path = ['/usr/share/reportbug'] + sys.path
-
+import sys
+import os
import optparse
import re
import locale
@@ -142,7 +141,7 @@
editor=None, charset='utf-8'):
if not editor:
editor = options.editor
- editor = reportbug.which_editor(editor)
+ editor = utils.which_editor(editor)
message = None
skip_editing = False
while True:
Modified: branches/modules/checks/compare_pseudo-pkgs_lists.py
===================================================================
--- branches/modules/checks/compare_pseudo-pkgs_lists.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/checks/compare_pseudo-pkgs_lists.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -8,7 +8,7 @@
import sys, os
sys.path = ['.'] + sys.path
-import reportbuglib.debianbts as debianbts
+from reportbug import debianbts
import urllib, re
Modified: branches/modules/debian/control
===================================================================
--- branches/modules/debian/control 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/debian/control 2008-07-08 19:13:40 UTC (rev 569)
@@ -5,7 +5,7 @@
Uploaders: Sandro Tosi <matrixhasu at gmail.com>, Y Giridhar Appaji Nag <giridhar at appaji.net>, Chris Lawrence <lawrencc at debian.org>
Standards-Version: 3.8.0
Build-Depends: debhelper (>= 5.0.37.2), po4a (>= 0.23)
-Build-Depends-Indep: python-dev, python-central (>= 0.5.14), python-nose
+Build-Depends-Indep: python-dev, python-central (>= 0.5.14), python-nose, python-setuptools
XS-Python-Version: current, >= 2.4
DM-Upload-Allowed: yes
Vcs-Svn: svn://svn.debian.org/svn/reportbug/trunk/
Modified: branches/modules/debian/rules
===================================================================
--- branches/modules/debian/rules 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/debian/rules 2008-07-08 19:13:40 UTC (rev 569)
@@ -13,7 +13,7 @@
dh_testdir
# Test if versions are synchronized; this will bomb if not synced
- @python -c "import dreportbug, sys; sys.exit(dreportbug.VERSION_NUMBER != '$(VERSION)')"
+ @python -c "import reportbug, sys; sys.exit(reportbug.VERSION_NUMBER != '$(VERSION)')"
po4a po4a/po4a.cfg
python setup.py build
Modified: branches/modules/presubj
===================================================================
--- branches/modules/presubj 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/presubj 2008-07-08 19:13:40 UTC (rev 569)
@@ -3,7 +3,7 @@
EXIM IS CONFIGURED FOR LOCAL DELIVERY: In Debian 4.0 (etch) and later,
exim4 is configured by default to only deliver email to addresses
on your system. YOUR BUG REPORTS WILL NOT ARRIVE AT THE BUG
- TRACKING SYSTEM UNLESS YOU FOLLOW ONE OF THE FOLLOWING STEPS, either:
+ TRACKING SYSTEM UNLESS YOU FOLLOW ONE OF THE FOLLOWING STEPS:
- Reconfigure exim (using 'dpkg-reconfigure -plow exim4') to send
mail to the Internet directly or via a smarthost.
@@ -11,6 +11,9 @@
- Configure reportbug to deliver mail to your ISP's smarthost or
bugs.debian.org directly (using 'reportbug --configure').
+ - Alternatively, see /usr/share/doc/reportbug/README.Users for
+ instructions on how to use GMail's SMTP server to submit reports.
+
EMAIL ADDRESS SETTING: See the manual page reportbug(1) for how to set
your email address (i.e. the address that appears in the "From:"
header), if reportbug is unable to correctly figure it out for you.
@@ -23,3 +26,6 @@
well. As an alternative, some mail programs, such as "mutt", can
be configured to be used as the editor for your report, which you
may find preferable.
+
+(You may need to press 'q' to exit your pager and continue using
+reportbug at this point.)
Modified: branches/modules/reportbug/__init__.py
===================================================================
--- branches/modules/reportbug/__init__.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/reportbug/__init__.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -24,7 +24,7 @@
__all__ = ['bugreport', 'utils', 'urlutils', 'checkbuildd', 'checkversions',
'debianbts', 'exceptions', 'submit', 'tempfile']
-VERSION_NUMBER = "3.41"
+VERSION_NUMBER = "3.42"
if VERSION_NUMBER.startswith('#'):
VERSION_NUMBER = '(unreleased)'
Modified: branches/modules/reportbug/checkversions.py
===================================================================
--- branches/modules/reportbug/checkversions.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/reportbug/checkversions.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -32,7 +32,7 @@
import gc
import time
-import reportbug
+import utils
from urlutils import open_url
from reportbug.exceptions import (
NoNetwork,
@@ -300,7 +300,7 @@
stuff = get_versions_available(package, dists, http_proxy, arch)
avail.update(stuff)
if check_newqueue:
- srcpackage = reportbug.get_source_name(package)
+ srcpackage = utils.get_source_name(package)
if srcpackage is None:
srcpackage = package
stuff = get_newqueue_available(srcpackage, dists, http_proxy, arch)
Modified: branches/modules/reportbug/submit.py
===================================================================
--- branches/modules/reportbug/submit.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/reportbug/submit.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -39,11 +39,10 @@
from email.Header import Header
import mimetypes
-import reportbug
-from reportbug import VERSION, VERSION_NUMBER
+from __init__ import VERSION, VERSION_NUMBER
import debianbts
from tempfiles import TempFile, open_write_safe, tempfile_prefix
-from reportbug_exceptions import (
+from exceptions import (
NoMessage,
)
import ui.text as ui
Modified: branches/modules/reportbug/ui/text.py
===================================================================
--- branches/modules/reportbug/ui/text.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/reportbug/ui/text.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -1,6 +1,6 @@
# Text user interface for reportbug
# Written by Chris Lawrence <lawrencc at debian.org>
-# (C) 2001-06 Chris Lawrence
+# (C) 2001-08 Chris Lawrence
#
# This program is freely distributable per the following license:
#
@@ -35,14 +35,12 @@
except ImportError:
readline = None
-import reportbug
-import debianbts
-from reportbug_exceptions import (
+from .. import debianbts, utils, hiermatch
+from ..exceptions import (
NoReport, NoPackage, NoBugs, NoNetwork,
InvalidRegex,
)
-from urlutils import launch_browser
-import hiermatch
+from ..urlutils import launch_browser
ISATTY = sys.stdin.isatty()
charset = 'us-ascii'
@@ -895,7 +893,7 @@
for (lineno, line) in enumerate(file(filename)):
if line == '\n' and not ourline:
ourline = lineno + 2
- elif line.strip() == reportbug.NEWBIELINE:
+ elif line.strip() == utils.NEWBIELINE:
ourline = lineno + 2
opts = ''
Modified: branches/modules/reportbug/ui/urwid.py
===================================================================
--- branches/modules/reportbug/ui/urwid.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/reportbug/ui/urwid.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -1,6 +1,6 @@
# urwid user interface for reportbug
# Written by Chris Lawrence <lawrencc at debian.org>
-# (C) 2006 Chris Lawrence
+# (C) 2006-08 Chris Lawrence
#
# This program is freely distributable per the following license:
#
@@ -27,16 +27,17 @@
import sys
import re
-import reportbug
-from reportbug_exceptions import (
+from .. import utils
+from ..exceptions import (
UINotImportable,
NoPackage, NoBugs, NoNetwork, NoReport,
)
-from urlutils import launch_browser
-from reportbug_ui_text import (
+from ..urlutils import launch_browser
+from text import (
ewrite,
spawn_editor,
)
+from ..__init__ import VERSION
try:
import urwid.raw_display
@@ -293,7 +294,7 @@
chunks = [re.sub(r'\s+', ' ', x).strip() for x in chunks]
message = '\n\n'.join(chunks).strip()
- box = displaybox('', long_message=message, title=title or reportbug.VERSION)
+ box = displaybox('', long_message=message, title=title or VERSION)
box.show(ui)
def long_message(message, *args, **kwargs):
@@ -315,7 +316,7 @@
chunks = [re.sub(r'\s+', ' ', x).strip() for x in chunks]
message = '\n\n'.join(chunks).strip()
- box = dialog('', long_message=message, title=title or reportbug.VERSION)
+ box = dialog('', long_message=message, title=title or VERSION)
box.add_buttons([ ("OK", 0) ])
box.main(ui)
@@ -325,7 +326,7 @@
def select_options(msg, ok, help=None, allow_numbers=False, nowrap=False,
ui=None, title=None):
box = dialog('', long_message=msg, height=('relative', 80),
- title=title or reportbug.VERSION)
+ title=title or VERSION)
if not help:
help = {}
@@ -342,7 +343,7 @@
return result
def yes_no(msg, yeshelp, nohelp, default=True, nowrap=False, ui=None):
- box = dialog('', long_message=msg+"?", title=reportbug.VERSION)
+ box = dialog('', long_message=msg+"?", title=VERSION)
box.add_buttons([ ('Yes', True), ('No', False) ], default=1-int(default))
result = box.main(ui)
return result
@@ -350,9 +351,9 @@
def get_string(prompt, options=None, title=None, force_prompt=False,
default='', ui=None):
if title:
- title = '%s: %s' % (reportbug.VERSION, title)
+ title = '%s: %s' % (VERSION, title)
else:
- title = reportbug.VERSION
+ title = VERSION
box = textentry(prompt, title=title)
box.add_buttons([ ("OK", 0) ])
@@ -362,9 +363,9 @@
def get_multiline(prompt, options=None, title=None, force_prompt=False,
ui=None):
if title:
- title = '%s: %s' % (reportbug.VERSION, title)
+ title = '%s: %s' % (VERSION, title)
else:
- title = reportbug.VERSION
+ title = VERSION
box = textentry(prompt, multiline=True)
box.add_buttons([ ("OK", 0) ])
@@ -384,9 +385,9 @@
default = ''
if title:
- title = '%s: %s' % (reportbug.VERSION, title)
+ title = '%s: %s' % (VERSION, title)
else:
- title = reportbug.VERSION
+ title = VERSION
if isinstance(options, dict):
options = options.copy()
Modified: branches/modules/reportbug/urlutils.py
===================================================================
--- branches/modules/reportbug/urlutils.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/reportbug/urlutils.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -37,9 +37,9 @@
NoNetwork,
)
-from __init__ import VERSION
+from __init__ import VERSION_NUMBER
-UA_STR = 'reportbug/'+VERSION+' (Debian)'
+UA_STR = 'reportbug/'+VERSION_NUMBER+' (Debian)'
def decode (page):
"gunzip or deflate a compressed page"
Modified: branches/modules/reportbug/utils.py
===================================================================
--- branches/modules/reportbug/utils.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/reportbug/utils.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -46,18 +46,19 @@
PSEUDOHEADERS = ('Package', 'Version', 'Severity', 'File', 'Tags',
'Justification', 'Followup-For', 'Owner', 'User', 'Usertags')
-import imp
+AVAILABLE_UIS = ['text']
-VALID_UIS = ['newt', 'text', 'gnome2', 'urwid']
-AVAILABLE_UIS = []
-for ui in VALID_UIS:
- pkgname = 'dreportbug.ui.%s' % ui
+try:
+ import ui.urwid
+ AVAILABLE_UIS.append('urwid')
+except:
+ pass
- try:
- if imp.find_module(pkgname):
- AVAILABLE_UIS.append(ui)
- except ImportError:
- pass
+try:
+ import ui.gnome2
+ AVAILABLE_UIS.append('gnome2')
+except:
+ pass
UIS = {'text': 'A text-oriented console interface',
'urwid': 'A menu-based console interface',
Modified: branches/modules/test/scaffold.py
===================================================================
--- branches/modules/test/scaffold.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/scaffold.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -20,7 +20,7 @@
sys.path.insert(1, test_dir)
if not parent_dir in sys.path:
sys.path.insert(1, parent_dir)
-bin_dir = parent_dir
+bin_dir = os.path.join(parent_dir, 'bin')
def suite(module_name):
Modified: branches/modules/test/test_checkbuildd.py
===================================================================
--- branches/modules/test/test_checkbuildd.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/test_checkbuildd.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -13,4 +13,4 @@
import scaffold
-from reportbuglib import checkbuildd
+from reportbug import checkbuildd
Modified: branches/modules/test/test_checkversions.py
===================================================================
--- branches/modules/test/test_checkversions.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/test_checkversions.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -13,4 +13,4 @@
import scaffold
-from reportbuglib import checkversions
+from reportbug import checkversions
Modified: branches/modules/test/test_debianbts.py
===================================================================
--- branches/modules/test/test_debianbts.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/test_debianbts.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -13,4 +13,4 @@
import scaffold
-from reportbuglib import debianbts
+from reportbug import debianbts
Modified: branches/modules/test/test_hiermatch.py
===================================================================
--- branches/modules/test/test_hiermatch.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/test_hiermatch.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -13,4 +13,4 @@
import scaffold
-from reportbuglib import hiermatch
+from reportbug import hiermatch
Modified: branches/modules/test/test_rbtempfile.py
===================================================================
--- branches/modules/test/test_rbtempfile.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/test_rbtempfile.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -16,7 +16,7 @@
import scaffold
from scaffold import TestCase
-from reportbuglib import rbtempfile
+from reportbug import tempfiles as rbtempfile
class Test_cleanup_temp_file(TestCase):
Modified: branches/modules/test/test_reportbug.py
===================================================================
--- branches/modules/test/test_reportbug.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/test_reportbug.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -16,7 +16,7 @@
import scaffold
from scaffold import TestCase
-from reportbuglib import reportbug
+from reportbug import utils as reportbug
class Test_glob_escape(TestCase):
Modified: branches/modules/test/test_reportbug_exceptions.py
===================================================================
--- branches/modules/test/test_reportbug_exceptions.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/test_reportbug_exceptions.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -13,4 +13,4 @@
import scaffold
-from reportbuglib import reportbug_exceptions
+from reportbug import exceptions as reportbug_exceptions
Modified: branches/modules/test/test_reportbug_submit.py
===================================================================
--- branches/modules/test/test_reportbug_submit.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/test_reportbug_submit.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -13,4 +13,4 @@
import scaffold
-from reportbuglib import reportbug_submit
+from reportbug import submit as reportbug_submit
Modified: branches/modules/test/test_reportbug_ui_newt.py
===================================================================
--- branches/modules/test/test_reportbug_ui_newt.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/test_reportbug_ui_newt.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -13,4 +13,4 @@
import scaffold
-from reportbuglib import reportbug_ui_newt
+from reportbug.ui import newt as reportbug_ui_newt
Modified: branches/modules/test/test_reportbug_ui_text.py
===================================================================
--- branches/modules/test/test_reportbug_ui_text.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/test_reportbug_ui_text.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -13,4 +13,4 @@
import scaffold
-from reportbuglib import reportbug_ui_text
+from reportbug.ui import text as reportbug_ui_text
Modified: branches/modules/test/test_reportbug_ui_urwid.py
===================================================================
--- branches/modules/test/test_reportbug_ui_urwid.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/test_reportbug_ui_urwid.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -14,8 +14,8 @@
import scaffold
from scaffold import TestCase
-from reportbuglib import reportbug_ui_urwid
-from reportbuglib import reportbug_ui_text
+from reportbug.ui import urwid as reportbug_ui_urwid
+from reportbug.ui import text as reportbug_ui_text
class Test_ewrite(TestCase):
Modified: branches/modules/test/test_urlutils.py
===================================================================
--- branches/modules/test/test_urlutils.py 2008-07-08 19:11:01 UTC (rev 568)
+++ branches/modules/test/test_urlutils.py 2008-07-08 19:13:40 UTC (rev 569)
@@ -16,8 +16,8 @@
import scaffold
from scaffold import TestCase
-from reportbuglib import reportbug_exceptions
-from reportbuglib import urlutils
+from reportbug import exceptions as reportbug_exceptions
+from reportbug import urlutils
class StubObject(object):
More information about the Reportbug-commits
mailing list