diff --git a/README.md b/README.md index e0469a2..6f29d96 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,6 @@ Change log ---------- ### March 9 2013 The `custom_config` branch has been merged into the master branch. - * Customization of formatprograms can be done easily now, as explained above. * I set the default tabwidth to 4 for all formatprograms as well as for vim itself. * The default parameters for astyle have been slightly modified: it will wrap spaces around operators. @@ -107,8 +106,6 @@ The `custom_config` branch has been merged into the master branch. ### March 16 2013 The `dynamic_indent_width` branch has been merged into the master branch. - * The options `expandtab`, `shiftwidth`, `tabstop` and `softtabstop` are not overwritten anymore. * This obsoletes `g:autoformat_no_default_shiftwidth` * `g:formatprg_args_expr_` is introduced. -* For the default formatprogram definitions, the options `expandtab` and `shiftwidth` are taken into account whenever possible. diff --git a/samples/python.py b/samples/python.py index b4feb40..c177f18 100644 --- a/samples/python.py +++ b/samples/python.py @@ -16,7 +16,7 @@ try: class Canceled(Exception): "Exception used to cancel run()." except (NameError,TypeError): - Canceled=__name__ + ".Canceled" + Canceled=__name__+".Canceled" class SuckerThread(websucker.Sucker): stopit=0 savedir=None @@ -25,9 +25,7 @@ class SuckerThread(websucker.Sucker): self.msgq=msgq websucker.Sucker.__init__(self) self.setflags(verbose=VERBOSE) - self.urlopener.addheaders=[ - ('User-agent','websucker/%s' % websucker.__version__), - ] + self.urlopener.addheaders=[('User-agent','websucker/%s'%websucker.__version__),] def message(self,format,*args): if args: format=format%args