divmod-dev team mailing list archive

[Tristan Seligmann <mithrandi@xxxxxxxxxxxxx>]

Tristan Seligmann has proposed merging lp:~divmod-dev/divmod.org/fix-deprecation-warnings into lp:divmod.org.

Requested reviews:
  Jonathan Jacobs (jjacobs)

For more details, see:
https://code.launchpad.net/~divmod-dev/divmod.org/fix-deprecation-warnings/+merge/72323

Okay, somehow I missed one of these.
-- 
https://code.launchpad.net/~divmod-dev/divmod.org/fix-deprecation-warnings/+merge/72323
Your team Divmod-dev is subscribed to branch lp:divmod.org.

=== modified file 'Mantissa/xmantissa/test/test_website.py'
--- Mantissa/xmantissa/test/test_website.py	2009-07-08 01:51:14 +0000
+++ Mantissa/xmantissa/test/test_website.py	2011-08-21 03:43:23 +0000
@@ -2,7 +2,7 @@
 from epsilon import hotfix
 hotfix.require('twisted', 'trial_assertwarns')
 
-import sha
+from hashlib import sha1
 
 from zope.interface import implements
 from zope.interface.verify import verifyObject
@@ -632,7 +632,7 @@
                 return result
         self.store.inMemoryPowerUp(SiteRootPlugin(), ISessionlessSiteRootPlugin)
 
-        resource = wrapper.locateChild(req, segments)
+        wrapper.locateChild(req, segments)
         self.assertEqual(calledWith, [(req, ("foo", "bar"))])
 
 
@@ -653,7 +653,7 @@
                 return result
         self.store.inMemoryPowerUp(SiteRootPlugin(), ISessionlessSiteRootPlugin)
 
-        resource = wrapper.locateChild(req, segments)
+        wrapper.locateChild(req, segments)
         self.assertEqual(calledWith, [segments])
 
 
@@ -1169,7 +1169,7 @@
         jsDir = FilePath(__file__).parent().parent().child("js")
         modulePath = jsDir.child(module).child("__init__.js")
         moduleContents = modulePath.open().read()
-        expect = sha.new(moduleContents).hexdigest()
+        expect = sha1(moduleContents).hexdigest()
         self.assertEqual(page.getJSModuleURL(module),
                          url.child(expect).child(module))