[Reportbug-commits] r637 - in trunk (bin/reportbug debian/changelog setup.py)

[morph-guest at users.alioth.debian.org]

    Date: Saturday, August 30, 2008 @ 23:50:11
  Author: morph-guest
Revision: 637

fixes for modularization: at least now --template works

Modified:
  trunk/bin/reportbug
  trunk/debian/changelog
  trunk/setup.py

Modified: trunk/bin/reportbug
===================================================================
--- trunk/bin/reportbug	2008-08-30 20:17:45 UTC (rev 636)
+++ trunk/bin/reportbug	2008-08-30 23:50:11 UTC (rev 637)
@@ -38,8 +38,11 @@
 import textwrap
 
 from reportbug import utils
+from reportbug import (
+    VERSION,
+    COPYRIGHT
+    )
 from reportbug.utils import (
-    VERSION, COPYRIGHT,
     MODE_EXPERT, MODE_ADVANCED, MODE_NOVICE, MODE_STANDARD,
     )
 from reportbug.tempfiles import (
@@ -827,9 +830,9 @@
                             "indicate problems with this interface.\n",
                             interface)
 
-        iface = 'reportbug_ui_%(interface)s' % vars()
+        iface = '%(interface)s' % vars()
         try:
-            lib_package = __import__('reportbuglib', fromlist=[iface])
+            lib_package = __import__('reportbug.ui', fromlist=[iface])
             ui = getattr(lib_package, iface)
         except UINotImportable, msg:
             ui.long_message('*** Unable to import %s interface: %s '
@@ -837,7 +840,7 @@
                             interface, msg)
             ewrite('\n')
 
-        reportbug.submit.ui = ui
+        submit.ui = ui
         # Add INTERFACE as an environment variable to access it from the
         # script gathering the special information for reportbug, when
         # a new bug should be filed against it.
@@ -1809,7 +1812,7 @@
         # newline in the message.  See #234963.
         body = body.rstrip('\n')+'\n'
 
-        reportbug.submit.send_report(
+        submit.send_report(
             body, attachments, mua, fromaddr, sendto, ccaddr, bccaddr,
             headers, package, charset, mailing, sysinfo, rtype, exinfo,
             self.options.replyto, self.options.printonly, self.options.template,

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-08-30 20:17:45 UTC (rev 636)
+++ trunk/debian/changelog	2008-08-30 23:50:11 UTC (rev 637)
@@ -3,8 +3,18 @@
   [ Chris Lawrence ]
   * Split off python-reportbug into a separate package.
 
- -- Sandro Tosi <matrixhasu at gmail.com>  Sun, 17 Aug 2008 01:06:52 +0200
+  [ Sandro Tosi ]
+  * Split off python-reportbug into a separate package
+    - bin/reportbug
+      + fixed VERSION and COPYRIGHT import
+      + hacked the way to identify working ui ******* NEEDS ADDITIONAL FIX, line 833 ***********
+      + remove module name from some methods call, since we import selectively
+        some methods only
+    - setup.py
+      + added reportbug.ui to packages to install UI files
 
+ -- Sandro Tosi <matrixhasu at gmail.com>  Sun, 31 Aug 2008 01:39:08 +0200
+
 reportbug (3.45) unstable; urgency=low
 
   * reportbuglib/reportbug_ui_urwid.py

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2008-08-30 20:17:45 UTC (rev 636)
+++ trunk/setup.py	2008-08-30 23:50:11 UTC (rev 637)
@@ -22,5 +22,6 @@
       url='http://alioth.debian.org/projects/reportbug',
       data_files=[('share/reportbug', ['handle_bugscript', 'reportbug.el']),
                   ('share/bug/reportbug', ['presubj', 'script'])],
-      license='MIT', packages=['reportbug'],
+      license='MIT',
+      packages=['reportbug','reportbug.ui'],
       scripts=['bin/reportbug', 'bin/querybts'])