Commits

Jonathan Eunice  committed d188529

now using stuf.chainstuf; retested

  • Participants
  • Parent commits 9641521

Comments (0)

Files changed (2)

 """Interpolating string formatter. """
 
 import string, inspect, sys, itertools
-from otherstuf import chainstuf  
+from stuf import chainstuf  
 from options import Options, OptionsContext
 import six
 if six.PY3:
 
 ### Core Say class
 
-DEFAULT_FILES = [ stdout]
 
 class Say(object):
     """
         encoding=None if six.PY3 else 'utf-8',
                             # character encoding for output (needed on Python 2, not 3)
         encoded=None,       # character encoding to return
-        files=None,         # where is output headed? a list of write() able objects
+        files= [stdout],    # where is output headed? a list of write() able objects
                             # NB Set to [stdout] but in way that gets around stuf bug
         wrap=None,          # column to wrap text to, if any
         sep=' ',            # separate args with this (Python print function compatible)
         retvalue=False,     # should return the value of the formatted string?
         _callframe=None,    # frome from which the caller was calling
     )
-    options.files = DEFAULT_FILES # to get around a bug in stuf
     
     options.magic(
         indent = lambda v, cur: cur.indent + int(v) if isinstance(v, str) else v
 
 setup(
     name='say',
-    version=verno("0.503"),
+    version=verno("0.512"),
     author='Jonathan Eunice',
     author_email='jonathan.eunice@gmail.com',
     description='Simple printing with templates. E.g.: say("Hello, {whoever}!", indent=1)',
     long_description=open('README.rst').read(),
     url='https://bitbucket.org/jeunice/say',
     py_modules=['say'],
-    install_requires=['six','options>=0.3', 'otherstuf>=0.8'],
+    install_requires=['six','options>=0.325', 'stuf>=0.9.10'],
     tests_require = ['tox', 'pytest'],
     zip_safe = True,
     keywords='print format template interpolate say',
     classifiers=linelist("""
-        Development Status :: 3 - Alpha
+        Development Status :: 4 - Beta
         Operating System :: OS Independent
         License :: OSI Approved :: BSD License
         Intended Audience :: Developers