rpms/python-toscawidgets/devel python-toscawidgets-deprecation.patch, NONE, 1.1 python-toscawidgets.spec, 1.14, 1.15

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/python-toscawidgets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15970

Modified Files:
	python-toscawidgets.spec 
Added Files:
	python-toscawidgets-deprecation.patch 
Log Message:

* Sun Nov 29 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.9.8-2
- Fix deprecation warnings


python-toscawidgets-deprecation.patch:
 command.py |    7 +++++--
 view.py    |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE python-toscawidgets-deprecation.patch ---
Index: ToscaWidgets-0.9.8/tw/core/command.py
===================================================================
--- ToscaWidgets-0.9.8.orig/tw/core/command.py
+++ ToscaWidgets-0.9.8/tw/core/command.py
@@ -6,7 +6,10 @@ import sys
 import os
 import tempfile
 import subprocess
-import md5
+try:
+        from hashlib import md5 as hash_constructor
+except ImportError:
+        from md5 import new as hash_constructor
 import mimetypes
 
 try:
@@ -547,7 +550,7 @@ class aggregate_tw_resources(Command):
             # this must result in an existing variant_filename
             resource_aggregator.flush()
             inf = open(variant_filename)
-            hash = md5.new()
+            hash = hash_constructor()
             while True:
                 block = inf.read(4096)
                 if not block:
Index: ToscaWidgets-0.9.8/tw/core/view.py
===================================================================
--- ToscaWidgets-0.9.8.orig/tw/core/view.py
+++ ToscaWidgets-0.9.8/tw/core/view.py
@@ -220,7 +220,7 @@ class Renderable(object):
         """)
 
     def __new__(cls, *args, **kw):
-        obj = object.__new__(cls, *args, **kw)
+        obj = object.__new__(cls)
         obj.template = kw.pop("template", obj.template)
         engine_name = kw.pop("engine_name", None)
         if obj.template is not None:


Index: python-toscawidgets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-toscawidgets/devel/python-toscawidgets.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- python-toscawidgets.spec	1 Oct 2009 15:43:57 -0000	1.14
+++ python-toscawidgets.spec	29 Nov 2009 19:47:22 -0000	1.15
@@ -5,12 +5,14 @@
 
 Name:           python-toscawidgets
 Version:        0.9.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Toolkit to help create widgets for WSGI web apps
 Group:          Development/Languages
 License:        MIT
 URL:            http://toscawidgets.org/
 Source0:        http://pypi.python.org/packages/source/T/%{srcname}/%{srcname}-%{version}.tar.gz
+# http://toscawidgets.org/trac/tw/ticket/46
+Patch0: python-toscawidgets-deprecation.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -36,6 +38,7 @@ or frameworks.
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p1 -b .depr
 
 %build
 %{__python} setup.py build
@@ -56,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 29 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.9.8-2
+- Fix deprecation warnings
+
 * Thu Oct 01 2009 Luke Macken <lmacken at redhat.com> - 0.9.8-1
 - 0.9.8 release
 - Remove js patch which is now upstream