1212 :license: BOLA, see LICENSE for details
1313"""
1414
15+ from __future__ import unicode_literals
16+
1517import posixpath
1618from os import path
1719
@@ -46,8 +48,8 @@ def get_basename(text, options, prefix='aafig'):
4648 options = options .copy ()
4749 if 'format' in options :
4850 del options ['format' ]
49- hashkey = text . encode ( 'utf-8' ) + str (options )
50- id = sha (hashkey ).hexdigest ()
51+ hashkey = text + str (options )
52+ id = sha (hashkey . encode ( 'utf-8' ) ).hexdigest ()
5153 return '%s-%s' % (prefix , id )
5254
5355
@@ -75,7 +77,7 @@ class AafigDirective(images.Image):
7577
7678 def run (self ):
7779 aafig_options = dict ()
78- own_options_keys = self .own_option_spec .keys () + ['scale' ]
80+ own_options_keys = [ self .own_option_spec .keys ()] + ['scale' ]
7981 for (k , v ) in self .options .items ():
8082 if k in own_options_keys :
8183 # convert flags to booleans
@@ -123,7 +125,7 @@ def render_aafig_images(app, doctree):
123125 continue
124126 try :
125127 fname , outfn , id , extra = render_aafigure (app , text , options )
126- except AafigError , exc :
128+ except AafigError as exc :
127129 app .builder .warn ('aafigure error: ' + str (exc ))
128130 img .replace_self (nodes .literal_block (text , text ))
129131 continue
@@ -171,7 +173,7 @@ def render_aafigure(app, text, options):
171173 f = None
172174 try :
173175 try :
174- f = file (metadata_fname , 'r' )
176+ f = open (metadata_fname , 'r' )
175177 extra = f .read ()
176178 except :
177179 raise AafigError ()
@@ -187,13 +189,13 @@ def render_aafigure(app, text, options):
187189 try :
188190 (visitor , output ) = aafigure .render (text , outfn , options )
189191 output .close ()
190- except aafigure .UnsupportedFormatError , e :
192+ except aafigure .UnsupportedFormatError as e :
191193 raise AafigError (str (e ))
192194
193195 extra = None
194196 if options ['format' ].lower () == 'svg' :
195197 extra = visitor .get_size_attrs ()
196- f = file (metadata_fname , 'w' )
198+ f = open (metadata_fname , 'w' )
197199 f .write (extra )
198200 f .close ()
199201
0 commit comments