Ticket #1389: 1389-include-original-msg.darcs.patch

4 patches for repository davidsarah@dev.allmydata.org:/home/darcs/tahoe/trunk:

Sat Apr  9 01:44:33 BST 2011  david-sarah@jacaranda.org
  * allmydata/__init__.py: preserve the message of ImportErrors in the package versions string. fixes #1389

Sun Apr 10 13:01:30 BST 2011  zooko@zooko.com
  * tests: add test for including ImportError message in the summary of dependencies
  refs. #1389

Sun Apr 10 15:59:55 BST 2011  zooko@zooko.com
  * packaging: show the file, line number, function, and line of code that raised ImportError
  ref #1389

Sun Apr 10 16:49:55 BST 2011  david-sarah@jacaranda.org
  * packaging: show also the message of the original ImportError. Ensure that an empty traceback is tolerated. Updates and makes minor cleanups to test. refs #1389

New patches:

[allmydata/__init__.py: preserve the message of ImportErrors in the package versions string. fixes #1389
david-sarah@jacaranda.org**20110409004433
 Ignore-this: caff24ad49573d66bc61d0a397b51afe
] {
hunk ./src/allmydata/__init__.py 189
             try:
                 __import__(modulename)
                 module = sys.modules[modulename]
-            except ImportError:
-                packages.append( (pkgname, (None, None, modulename)) )
+            except ImportError, e:
+                packages.append( (pkgname, (None, None, "%s because of: %s" % (modulename, str(e)))) )
             else:
                 if 'sqlite' in pkgname:
                     packages.append( (pkgname, (get_version(module, 'version'), package_dir(module.__file__),
hunk ./src/allmydata/__init__.py 221
         return
     (actual, location, comment) = vers_and_locs[name]
     if actual is None:
-        # comment is the module name
-        raise ImportError("could not import %r for requirement %r" % (comment, req))
+        # comment is the module name and message of the original ImportError
+        raise ImportError("for requirement %r, could not import %s" % (req, comment))
     if actual == 'unknown':
         return
     actualver = normalized_version(actual, what="actual version %r of %s from %r" % (actual, name, location))
}
[tests: add test for including ImportError message in the summary of dependencies
zooko@zooko.com**20110410120130
 Ignore-this: 581b37aaba6ee00fea8d0beea45d556c
 refs. #1389
] {
addfile ./src/allmydata/test/test_package_initialization.py
hunk ./src/allmydata/test/test_package_initialization.py 1
+
+from twisted.trial import unittest
+
+import allmydata
+
+import sys
+
+class T(unittest.TestCase):
+    def test_report_import_error(self):
+        try:
+            real_import_func = __builtins__['__import__']
+
+            def raiseIE(name, *args):
+                if name == "foolscap":
+                    raise ImportError("wheeeyo foolscap cant be imported")
+                else:
+                    return real_import_func(name, *args)
+
+            __builtins__['__import__'] = raiseIE
+            vers_and_locs =  allmydata.get_package_versions_and_locations()
+            for (pkgname, stuff) in vers_and_locs:
+                if pkgname == 'foolscap':
+                    self.failUnless('wheeeyo' in stuff[2], stuff)
+        finally:
+            __builtins__['__import__'] = real_import_func
}
[packaging: show the file, line number, function, and line of code that raised ImportError
zooko@zooko.com**20110410145955
 Ignore-this: 82e0c1261a5b03c136241660a52b9a0b
 ref #1389
] {
hunk ./src/allmydata/__init__.py 35
 # http://allmydata.org/trac/tahoe/wiki/Versioning
 __full_version__ = __appname__ + '/' + str(__version__)
 
-import os, platform, re, subprocess, sys
+import os, platform, re, subprocess, sys, traceback
 _distributor_id_cmdline_re = re.compile("(?:Distributor ID:)\s*(.*)", re.I)
 _release_cmdline_re = re.compile("(?:Release:)\s*(.*)", re.I)
 
hunk ./src/allmydata/__init__.py 140
     try:
         return verlib.NormalizedVersion(verlib.suggest_normalized_version(verstr))
     except (StandardError, verlib.IrrationalVersionError):
-        cls, value, traceback = sys.exc_info()
+        cls, value, trace = sys.exc_info()
         raise PackagingError, ("could not parse %s due to %s: %s"
hunk ./src/allmydata/__init__.py 142
-                               % (what or repr(verstr), cls.__name__, value)), traceback
+                               % (what or repr(verstr), cls.__name__, value)), trace
 
 
 def get_package_versions_and_locations():
hunk ./src/allmydata/__init__.py 189
             try:
                 __import__(modulename)
                 module = sys.modules[modulename]
-            except ImportError, e:
-                packages.append( (pkgname, (None, None, "%s because of: %s" % (modulename, str(e)))) )
+            except ImportError:
+                etype, emsg, etrace = sys.exc_info()
+                tracestr = traceback.extract_tb(etrace)[-1]
+                packages.append( (pkgname, (None, None, tracestr)) )
             else:
                 if 'sqlite' in pkgname:
                     packages.append( (pkgname, (get_version(module, 'version'), package_dir(module.__file__),
hunk ./src/allmydata/__init__.py 224
     (actual, location, comment) = vers_and_locs[name]
     if actual is None:
         # comment is the module name and message of the original ImportError
-        raise ImportError("for requirement %r, could not import %s" % (req, comment))
+        raise ImportError("for requirement %r: %s" % (req, comment))
     if actual == 'unknown':
         return
     actualver = normalized_version(actual, what="actual version %r of %s from %r" % (actual, name, location))
hunk ./src/allmydata/test/test_package_initialization.py 6
 
 import allmydata
 
-import sys
+import mock
+
+real_import_func = __builtins__['__import__']
 
 class T(unittest.TestCase):
hunk ./src/allmydata/test/test_package_initialization.py 11
-    def test_report_import_error(self):
-        try:
-            real_import_func = __builtins__['__import__']
+    @mock.patch('__builtin__.__import__')
+    def test_report_import_error(self, mockimport):
+        def raiseIE_from_this_particular_func(name, *args):
+            if name == "foolscap":
+                raise ImportError("wheeeyo foolscap cant be imported")
+            else:
+                return real_import_func(name, *args)
 
hunk ./src/allmydata/test/test_package_initialization.py 19
-            def raiseIE(name, *args):
-                if name == "foolscap":
-                    raise ImportError("wheeeyo foolscap cant be imported")
-                else:
-                    return real_import_func(name, *args)
+        mockimport.side_effect = raiseIE_from_this_particular_func
 
hunk ./src/allmydata/test/test_package_initialization.py 21
-            __builtins__['__import__'] = raiseIE
-            vers_and_locs =  allmydata.get_package_versions_and_locations()
-            for (pkgname, stuff) in vers_and_locs:
-                if pkgname == 'foolscap':
-                    self.failUnless('wheeeyo' in stuff[2], stuff)
-        finally:
-            __builtins__['__import__'] = real_import_func
+        vers_and_locs =  allmydata.get_package_versions_and_locations()
+        for (pkgname, stuff) in vers_and_locs:
+            if pkgname == 'foolscap':
+                self.failUnless('wheeeyo' in str(stuff[2]), stuff)
+                self.failUnless('raiseIE_from_this_particular_func' in stuff[2], stuff)
}
[packaging: show also the message of the original ImportError. Ensure that an empty traceback is tolerated. Updates and makes minor cleanups to test. refs #1389
david-sarah@jacaranda.org**20110410154955
 Ignore-this: e9a70998d64af82a598f45d526ae2aa6
] {
hunk ./src/allmydata/__init__.py 191
                 module = sys.modules[modulename]
             except ImportError:
                 etype, emsg, etrace = sys.exc_info()
-                tracestr = traceback.extract_tb(etrace)[-1]
-                packages.append( (pkgname, (None, None, tracestr)) )
+                trace_info = (emsg, ([None] + traceback.extract_tb(etrace))[-1])
+                packages.append( (pkgname, (None, None, trace_info)) )
             else:
                 if 'sqlite' in pkgname:
                     packages.append( (pkgname, (get_version(module, 'version'), package_dir(module.__file__),
hunk ./src/allmydata/__init__.py 223
         return
     (actual, location, comment) = vers_and_locs[name]
     if actual is None:
-        # comment is the module name and message of the original ImportError
+        # comment is (message, (filename, line number, function name, text)) for the original ImportError
         raise ImportError("for requirement %r: %s" % (req, comment))
     if actual == 'unknown':
         return
hunk ./src/allmydata/test/test_package_initialization.py 5
 from twisted.trial import unittest
 
 import allmydata
-
 import mock
 
hunk ./src/allmydata/test/test_package_initialization.py 7
-real_import_func = __builtins__['__import__']
+real_import_func = __import__
 
 class T(unittest.TestCase):
     @mock.patch('__builtin__.__import__')
hunk ./src/allmydata/test/test_package_initialization.py 14
     def test_report_import_error(self, mockimport):
         def raiseIE_from_this_particular_func(name, *args):
             if name == "foolscap":
-                raise ImportError("wheeeyo foolscap cant be imported")
+                marker = "wheeeyo"
+                raise ImportError(marker + " foolscap cant be imported")
             else:
                 return real_import_func(name, *args)
 
hunk ./src/allmydata/test/test_package_initialization.py 25
         for (pkgname, stuff) in vers_and_locs:
             if pkgname == 'foolscap':
                 self.failUnless('wheeeyo' in str(stuff[2]), stuff)
-                self.failUnless('raiseIE_from_this_particular_func' in stuff[2], stuff)
+                self.failUnless('raiseIE_from_this_particular_func' in str(stuff[2]), stuff)
}

Context:

[remove unused variable detected by pyflakes
zooko@zooko.com**20110407172231
 Ignore-this: 7344652d5e0720af822070d91f03daf9
] 
[allmydata/__init__.py: Nicer reporting of unparseable version numbers in dependencies. fixes #1388
david-sarah@jacaranda.org**20110401202750
 Ignore-this: 9c6bd599259d2405e1caadbb3e0d8c7f
] 
[update FTP-and-SFTP.rst: the necessary patch is included in Twisted-10.1
Brian Warner <warner@lothar.com>**20110325232511
 Ignore-this: d5307faa6900f143193bfbe14e0f01a
] 
[control.py: remove all uses of s.get_serverid()
warner@lothar.com**20110227011203
 Ignore-this: f80a787953bd7fa3d40e828bde00e855
] 
[web: remove some uses of s.get_serverid(), not all
warner@lothar.com**20110227011159
 Ignore-this: a9347d9cf6436537a47edc6efde9f8be
] 
[immutable/downloader/fetcher.py: remove all get_serverid() calls
warner@lothar.com**20110227011156
 Ignore-this: fb5ef018ade1749348b546ec24f7f09a
] 
[immutable/downloader/fetcher.py: fix diversity bug in server-response handling
warner@lothar.com**20110227011153
 Ignore-this: bcd62232c9159371ae8a16ff63d22c1b
 
 When blocks terminate (either COMPLETE or CORRUPT/DEAD/BADSEGNUM), the
 _shares_from_server dict was being popped incorrectly (using shnum as the
 index instead of serverid). I'm still thinking through the consequences of
 this bug. It was probably benign and really hard to detect. I think it would
 cause us to incorrectly believe that we're pulling too many shares from a
 server, and thus prefer a different server rather than asking for a second
 share from the first server. The diversity code is intended to spread out the
 number of shares simultaneously being requested from each server, but with
 this bug, it might be spreading out the total number of shares requested at
 all, not just simultaneously. (note that SegmentFetcher is scoped to a single
 segment, so the effect doesn't last very long).
] 
[immutable/downloader/share.py: reduce get_serverid(), one left, update ext deps
warner@lothar.com**20110227011150
 Ignore-this: d8d56dd8e7b280792b40105e13664554
 
 test_download.py: create+check MyShare instances better, make sure they share
 Server objects, now that finder.py cares
] 
[immutable/downloader/finder.py: reduce use of get_serverid(), one left
warner@lothar.com**20110227011146
 Ignore-this: 5785be173b491ae8a78faf5142892020
] 
[immutable/offloaded.py: reduce use of get_serverid() a bit more
warner@lothar.com**20110227011142
 Ignore-this: b48acc1b2ae1b311da7f3ba4ffba38f
] 
[immutable/upload.py: reduce use of get_serverid()
warner@lothar.com**20110227011138
 Ignore-this: ffdd7ff32bca890782119a6e9f1495f6
] 
[immutable/checker.py: remove some uses of s.get_serverid(), not all
warner@lothar.com**20110227011134
 Ignore-this: e480a37efa9e94e8016d826c492f626e
] 
[add remaining get_* methods to storage_client.Server, NoNetworkServer, and
warner@lothar.com**20110227011132
 Ignore-this: 6078279ddf42b179996a4b53bee8c421
 MockIServer stubs
] 
[upload.py: rearrange _make_trackers a bit, no behavior changes
warner@lothar.com**20110227011128
 Ignore-this: 296d4819e2af452b107177aef6ebb40f
] 
[happinessutil.py: finally rename merge_peers to merge_servers
warner@lothar.com**20110227011124
 Ignore-this: c8cd381fea1dd888899cb71e4f86de6e
] 
[test_upload.py: factor out FakeServerTracker
warner@lothar.com**20110227011120
 Ignore-this: 6c182cba90e908221099472cc159325b
] 
[test_upload.py: server-vs-tracker cleanup
warner@lothar.com**20110227011115
 Ignore-this: 2915133be1a3ba456e8603885437e03
] 
[happinessutil.py: server-vs-tracker cleanup
warner@lothar.com**20110227011111
 Ignore-this: b856c84033562d7d718cae7cb01085a9
] 
[upload.py: more tracker-vs-server cleanup
warner@lothar.com**20110227011107
 Ignore-this: bb75ed2afef55e47c085b35def2de315
] 
[upload.py: fix var names to avoid confusion between 'trackers' and 'servers'
warner@lothar.com**20110227011103
 Ignore-this: 5d5e3415b7d2732d92f42413c25d205d
] 
[refactor: s/peer/server/ in immutable/upload, happinessutil.py, test_upload
warner@lothar.com**20110227011100
 Ignore-this: 7ea858755cbe5896ac212a925840fe68
 
 No behavioral changes, just updating variable/method names and log messages.
 The effects outside these three files should be minimal: some exception
 messages changed (to say "server" instead of "peer"), and some internal class
 names were changed. A few things still use "peer" to minimize external
 changes, like UploadResults.timings["peer_selection"] and
 happinessutil.merge_peers, which can be changed later.
] 
[storage_client.py: clean up test_add_server/test_add_descriptor, remove .test_servers
warner@lothar.com**20110227011056
 Ignore-this: efad933e78179d3d5fdcd6d1ef2b19cc
] 
[test_client.py, upload.py:: remove KiB/MiB/etc constants, and other dead code
warner@lothar.com**20110227011051
 Ignore-this: dc83c5794c2afc4f81e592f689c0dc2d
] 
[test: increase timeout on a network test because Francois's ARM machine hit that timeout
zooko@zooko.com**20110317165909
 Ignore-this: 380c345cdcbd196268ca5b65664ac85b
 I'm skeptical that the test was proceeding correctly but ran out of time. It seems more likely that it had gotten hung. But if we raise the timeout to an even more extravagant number then we can be even more certain that the test was never going to finish.
] 
[docs/configuration.rst: add a "Frontend Configuration" section
Brian Warner <warner@lothar.com>**20110222014323
 Ignore-this: 657018aa501fe4f0efef9851628444ca
 
 this points to docs/frontends/*.rst, which were previously underlinked
] 
[web/filenode.py: avoid calling req.finish() on closed HTTP connections. Closes #1366
"Brian Warner <warner@lothar.com>"**20110221061544
 Ignore-this: 799d4de19933f2309b3c0c19a63bb888
] 
[Add unit tests for cross_check_pkg_resources_versus_import, and a regression test for ref #1355. This requires a little refactoring to make it testable.
david-sarah@jacaranda.org**20110221015817
 Ignore-this: 51d181698f8c20d3aca58b057e9c475a
] 
[allmydata/__init__.py: .name was used in place of the correct .__name__ when printing an exception. Also, robustify string formatting by using %r instead of %s in some places. fixes #1355.
david-sarah@jacaranda.org**20110221020125
 Ignore-this: b0744ed58f161bf188e037bad077fc48
] 
[Refactor StorageFarmBroker handling of servers
Brian Warner <warner@lothar.com>**20110221015804
 Ignore-this: 842144ed92f5717699b8f580eab32a51
 
 Pass around IServer instance instead of (peerid, rref) tuple. Replace
 "descriptor" with "server". Other replacements:
 
  get_all_servers -> get_connected_servers/get_known_servers
  get_servers_for_index -> get_servers_for_psi (now returns IServers)
 
 This change still needs to be pushed further down: lots of code is now
 getting the IServer and then distributing (peerid, rref) internally.
 Instead, it ought to distribute the IServer internally and delay
 extracting a serverid or rref until the last moment.
 
 no_network.py was updated to retain parallelism.
] 
[TAG allmydata-tahoe-1.8.2
warner@lothar.com**20110131020101] 
Patch bundle hash:
958c2019b3d2fd1fb45268c1a937eab496c6abe5