switch away from svn, fix #283.

--HG--
branch : trunk

diff --git a/jinja/__init__.py b/jinja/__init__.py
index 3c09362a22f55d70948e6c4433c5056cdcd2ceac..726c7f00b574bd8c1a10414def22d119b92937ab 100644 (file)
--- a/jinja/__init__.py
+++ b/jinja/__init__.py
@@ -43,14 +43,14 @@
     the near future the best idea is to ship a Jinja 0.9 checkout together
     with the application.
 
-    The `Jinja trunk`_ is installable via `easy_install` with ``easy_install
+    The `Jinja tip`_ is installable via `easy_install` with ``easy_install
     Jinja==dev``.
 
     .. _sandboxed: http://en.wikipedia.org/wiki/Sandbox_(computer_security)
     .. _Django: http://www.djangoproject.com/
     .. _jinja webpage: http://jinja.pocoo.org/
     .. _documentation: http://jinja.pocoo.org/documentation/index.html
-    .. _Jinja trunk: http://trac.pocoo.org/repos/jinja/trunk#egg=Jinja-dev
+    .. _Jinja tip: http://dev.pocoo.org/hg/jinja-main/archive/tip.tar.gz#egg=Jinja-dev
 
 
     :copyright: 2007 by Armin Ronacher.

diff --git a/jinja/loaders.py b/jinja/loaders.py
index 4a5c7f83dcda2b23fbb130b11895adfd9d1b6fd2..35859a6f072521ea49247593cc991a93b761c43e 100644 (file)
--- a/jinja/loaders.py
+++ b/jinja/loaders.py
@@ -10,7 +10,10 @@
 """
 
 import codecs
-import sha
+try:
+    from hashlib import sha1
+except ImportError:
+    from sha import new as sha1
 import time
 from os import path
 from threading import Lock
@@ -38,8 +41,8 @@ def get_cachename(cachepath, name, salt=None):
     Return the filename for a cached file.
     """
     return path.join(cachepath, 'jinja_%s.cache' %
-                     sha.new('jinja(%s|%s)tmpl' %
-                             (name, salt or '')).hexdigest())
+                     sha1('jinja(%s|%s)tmpl' %
+                          (name, salt or '')).hexdigest())
 
 
 def _loader_missing(*args, **kwargs):

diff --git a/setup.cfg b/setup.cfg
index 19dd8210d0a47c1d32d826e7188282c4ca956ab7..2d74c58f248790e34e482eb07e20ec6c753c9d2d 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [egg_info]
 tag_build = dev
-tag_svn_revision = true
+tag_date = true
 
 [aliases]
 release = egg_info -RDb ''