Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

switch away from svn, fix #283.

--HG--
branch : trunk
  • Loading branch information...
commit a39502eb7173de930e20bf7e03f1bbe548844b18 1 parent 0167c1f
@mitsuhiko authored
Showing with 9 additions and 6 deletions.
  1. +2 −2 jinja/__init__.py
  2. +6 −3 jinja/loaders.py
  3. +1 −1  setup.cfg
View
4 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.
View
9 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):
View
2  setup.cfg
@@ -1,6 +1,6 @@
[egg_info]
tag_build = dev
-tag_svn_revision = true
+tag_date = true
[aliases]
release = egg_info -RDb ''

0 comments on commit a39502e

Please sign in to comment.
Something went wrong with that request. Please try again.