[cig-commits] r18479 - in cs/merlin/branches/v1: merlin merlin.egg-info

[tan2 at geodynamics.org]

Author: tan2
Date: 2011-05-27 11:19:37 -0700 (Fri, 27 May 2011)
New Revision: 18479

Modified:
   cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt
   cs/merlin/branches/v1/merlin.egg-info/entry_points.txt
   cs/merlin/branches/v1/merlin/package_index.py
Log:
replaced uses of md5.md5 with hashlib.md5 to prevent DeprecationWarning

Modified: cs/merlin/branches/v1/merlin/package_index.py
===================================================================
--- cs/merlin/branches/v1/merlin/package_index.py	2011-05-27 16:52:36 UTC (rev 18478)
+++ cs/merlin/branches/v1/merlin/package_index.py	2011-05-27 18:19:37 UTC (rev 18479)
@@ -4,7 +4,11 @@
 from merlin import *
 from distutils import log
 from distutils.errors import DistutilsError
-from md5 import md5
+try:
+    from hashlib import md5
+except ImportError:
+    # For Python 2.3, 2.4
+    from md5 import md5
 from fnmatch import translate
 
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$')

Modified: cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt
===================================================================
--- cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt	2011-05-27 16:52:36 UTC (rev 18478)
+++ cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt	2011-05-27 18:19:37 UTC (rev 18479)
@@ -29,8 +29,8 @@
 merlin.egg-info/SOURCES.txt
 merlin.egg-info/dependency_links.txt
 merlin.egg-info/entry_points.txt
-merlin.egg-info/not-zip-safe
 merlin.egg-info/top_level.txt
+merlin.egg-info/zip-safe
 merlin/archimedes/__init__.py
 merlin/command/__init__.py
 merlin/command/alias.py

Modified: cs/merlin/branches/v1/merlin.egg-info/entry_points.txt
===================================================================
--- cs/merlin/branches/v1/merlin.egg-info/entry_points.txt	2011-05-27 16:52:36 UTC (rev 18478)
+++ cs/merlin/branches/v1/merlin.egg-info/entry_points.txt	2011-05-27 18:19:37 UTC (rev 18479)
@@ -28,27 +28,26 @@
 
 [merlin.distutils.commands]
 bdist_rpm = merlin.command.bdist_rpm:bdist_rpm
-saveopts = merlin.command.saveopts:saveopts
-sdist = merlin.command.sdist:sdist
-sdist_egg = merlin.command.sdist_egg:sdist_egg
-build_ext = merlin.command.build_ext:build_ext
-develop = merlin.command.develop:develop
-build_py = merlin.command.build_py:build_py
-test = merlin.command.test:test
-install_scripts = merlin.command.install_scripts:install_scripts
-setopt = merlin.command.setopt:setopt
-egg_flags = merlin.command.egg_flags:egg_flags
-install_egg_info = merlin.command.install_egg_info:install_egg_info
 install_deps = merlin.command.install_deps:install_deps
 rotate = merlin.command.rotate:rotate
+develop = merlin.command.develop:develop
+setopt = merlin.command.setopt:setopt
+build_py = merlin.command.build_py:build_py
+saveopts = merlin.command.saveopts:saveopts
 egg_info = merlin.command.egg_info:egg_info
 register = merlin.command.register:register
-upload = merlin.command.upload:upload
+egg_flags = merlin.command.egg_flags:egg_flags
+install_egg_info = merlin.command.install_egg_info:install_egg_info
 alias = merlin.command.alias:alias
 easy_install = merlin.command.easy_install:easy_install
+install_scripts = merlin.command.install_scripts:install_scripts
+sdist_egg = merlin.command.sdist_egg:sdist_egg
 bdist_egg = merlin.command.bdist_egg:bdist_egg
 install = merlin.command.install:install
+test = merlin.command.test:test
 install_lib = merlin.command.install_lib:install_lib
+build_ext = merlin.command.build_ext:build_ext
+sdist = merlin.command.sdist:sdist
 
 [console_scripts]
 merlin = merlin:main