Merge branch 'mjanos5-master'

Author: faif

command.py

@@ -11,12 +11,14 @@ def __init__(self, src, dest):
         self.dest = dest
 
     def execute(self):
-        print('renaming {} to {}'.format(self.src, self.dest))
-        os.rename(self.src, self.dest)
+        self.rename(self.src, self.dest)
 
     def undo(self):
-        print('renaming {} to {}'.format(self.dest, self.src))
-        os.rename(self.dest, self.src)
+        self.rename(self.dest, self.src)
+
+    def rename(self, src, dest):
+        print('renaming {} to {}'.format(src, dest))
+        os.rename(src, dest)
 
 
 def main():

decorator.py

@@ -5,16 +5,17 @@
 
 
 def makebold(fn):
-    @wraps(fn)
-    def wrapped():
-        return "<b>" + fn() + "</b>"
-    return wrapped
+    return getwrapped(fn, "b")
 
 
 def makeitalic(fn):
+    return getwrapped(fn, "i")
+
+
+def getwrapped(fn, tag):
     @wraps(fn)
     def wrapped():
-        return "<i>" + fn() + "</i>"
+        return "<%s>%s</%s>" % (tag, fn(), tag)
     return wrapped