First stage of refactoring to support full simultaneous Python 2 and 3 compatibility via use of the six module.

1 files changed, 7 insertions, 6 deletions

diff --git a/docs/pycon2010/pirate8.py b/docs/pycon2010/pirate8.py
index 3e80b241..c80d41f4 100644
--- a/docs/pycon2010/pirate8.py
+++ b/docs/pycon2010/pirate8.py
@@ -1,3 +1,4 @@
+# coding=utf-8
 from cmd2 import Cmd, options, make_option
 # prompts and defaults
 
@@ -11,18 +12,18 @@ class Pirate(Cmd):
         self.gold += 1
     def do_drink(self, arg):
         '''Drown your sorrrows in rrrum.
-        
-        drink [n] - drink [n] barrel[s] o' rum.'''          
+
+        drink [n] - drink [n] barrel[s] o' rum.'''
         try:
             self.gold -= int(arg)
         except:
             if arg:
                 print('''What's "{0}"?  I'll take rrrum.'''.format(arg))
-            self.gold -= 1            
+            self.gold -= 1
     def precmd(self, line):
         self.initial_gold = self.gold
         return line
-    def postcmd(self, stop, line):   
+    def postcmd(self, stop, line):
         if self.gold != self.initial_gold:
             print('Now we gots {0} doubloons'
                   .format(self.gold))
@@ -32,7 +33,7 @@ class Pirate(Cmd):
         return stop
     def do_quit(self, arg):
         print("Quiterrr!")
-        return True    
+        return True
     default_to_shell = True
     multilineCommands = ['sing']
     terminators = Cmd.terminators + ['...']
@@ -44,7 +45,7 @@ class Pirate(Cmd):
     @options([make_option('--ho', type='int', default=2,
                           help="How often to chant 'ho'"),
               make_option('-c', '--commas',
-                          action="store_true", 
+                          action="store_true",
                           help="Intersperse commas")])
     def do_yo(self, arg, opts):
         chant = ['yo'] + ['ho'] * opts.ho