[gentoo-commits] proj/webapp-config:master commit in: WebappConfig/

[Anthony G. Basile]

commit:     df1ee77098fbb7eda685ffbea88dca9fea18adfd
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jun 28 23:13:53 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 12:50:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=df1ee770

Use print() function for compatibility with Python 3.

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

---
 WebappConfig/config.py  |    4 +-
 WebappConfig/db.py      |    2 +-
 WebappConfig/debug.py   |   69 ++++++++++++++++++++++++-----------------------
 WebappConfig/server.py  |    2 +-
 WebappConfig/version.py |    2 +-
 5 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 9ac303e..371602e 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -1055,9 +1055,9 @@ class Config:
             for i in self.config.options('USER'):
                 if not i in ['pn', 'pvr']:
                     try:
-                        print i.upper() + '="' + self.config.get('USER', i) + '"'
+                        print(i.upper() + '="' + self.config.get('USER', i) + '"')
                     except InterpolationSyntaxError:
-                        print '# Failed to evaluate: ' + i.upper()
+                        print('# Failed to evaluate: ' + i.upper())
 
             sys.exit(0)
 

diff --git a/WebappConfig/db.py b/WebappConfig/db.py
index aa78c24..fc221bf 100644
--- a/WebappConfig/db.py
+++ b/WebappConfig/db.py
@@ -456,7 +456,7 @@ class WebappDB(AppHierarchy):
                     OUT.info('  ' + i[3].strip(), 1)
                 else:
                     # This is a simplified form for the webapp.eclass
-                    print i[3].strip()
+                    print(i[3].strip())
 
 # ========================================================================
 # Handler for /usr/share/webapps

diff --git a/WebappConfig/debug.py b/WebappConfig/debug.py
index c3a5c47..7236e27 100644
--- a/WebappConfig/debug.py
+++ b/WebappConfig/debug.py
@@ -5,6 +5,7 @@
 # Copyright 2005 Gunnar Wrobel
 # Distributed under the terms of the GNU General Public License v2
 
+from __future__ import print_function
 __version__ = "$Id: debug.py 159 2005-11-10 09:48:25Z wrobel $"
 
 #################################################################################
@@ -294,7 +295,7 @@ class Message:
     ## Output Functions
 
     def notice (self, note):
-        print note
+        print(note)
 
     def info (self, info, level = 4):
 
@@ -304,7 +305,7 @@ class Message:
             return
 
         for i in info.split('\n'):
-            print self.maybe_color('green', '* ') + i
+            print(self.maybe_color('green', '* ') + i)
 
     def status (self, message, status, info = 'ignored'):
 
@@ -316,7 +317,7 @@ class Message:
             return
 
         for i in lines[0:-1]:
-            print self.maybe_color('green', '* ') + i
+            print(self.maybe_color('green', '* ') + i)
 
         i = lines[-1]
 
@@ -330,8 +331,8 @@ class Message:
         else:
             result = '[' + self.maybe_color('yellow', info) + ']'
 
-        print self.maybe_color('green', '* ') + i + ' ' + '.' * (58 - len(i))  \
-              + ' ' + result
+        print(self.maybe_color('green', '* ') + i + ' ' + '.' * (58 - len(i))  \
+              + ' ' + result)
 
     def warn (self, warn, level = 4):
 
@@ -341,14 +342,14 @@ class Message:
             return
 
         for i in warn.split('\n'):
-            print self.maybe_color('yellow', '* ') + i
+            print(self.maybe_color('yellow', '* ') + i)
 
     def error (self, error):
 
         error = str(error)
 
         for i in error.split('\n'):
-            print >> self.error_out, self.maybe_color('red', '* ') + i
+            print(self.maybe_color('red', '* ') + i, file=self.error_out)
         self.has_error = True
 
     def die (self, error):
@@ -429,11 +430,11 @@ class Message:
             if lines > 0:
                 for j in range(lines):
                     ## Print line with continuation marker
-                    print >> self.debug_out, ls + '// ' + x[0:60] + ' \\'
+                    print(ls + '// ' + x[0:60] + ' \\', file=self.debug_out)
                     ## Remove printed characters from output
                     x = x[60:]
             ## Print final line
-            print >> self.debug_out, ls + '// ' + x 
+            print(ls + '// ' + x, file=self.debug_out) 
 
         if self.debug_vrb == 1:
             # Top line indicates class and method
@@ -442,60 +443,60 @@ class Message:
                 c += 'Class: ' + str(callerobject.__class__.__name__) + ' | '
             if callermethod:
                 c += 'Method: ' + str(callermethod)
-            print >> self.debug_out, '// ' + c
+            print('// ' + c, file=self.debug_out)
             # Selected variables follow
             if callerlocals:
                 for i,j in callerlocals.items():
-                    print >> self.debug_out, '// '                              \
-                          + self.maybe_color('turquoise', str(i)) + ':' + str(j)
+                    print('// '                              \
+                          + self.maybe_color('turquoise', str(i)) + ':' + str(j), file=self.debug_out)
             # Finally the message
-            print >> self.debug_out, self.maybe_color('yellow', message)
+            print(self.maybe_color('yellow', message), file=self.debug_out)
             return
 
         if self.debug_vrb == 3:
-            print >> self.debug_out, ls + '/////////////////////////////////' + \
-                  '////////////////////////////////'
+            print(ls + '/////////////////////////////////' + \
+                  '////////////////////////////////', file=self.debug_out)
 
             # General information about what is being debugged
             #(module name or similar)
-            print >> self.debug_out, ls + '// ' + self.debug_env
-        print >> self.debug_out, ls + '//-----------------------------------' + \
-              '----------------------------'
+            print(ls + '// ' + self.debug_env, file=self.debug_out)
+        print(ls + '//-----------------------------------' + \
+              '----------------------------', file=self.debug_out)
 
         ## If the caller is a class print the name here
         if callerobject:
-            print >> self.debug_out, ls +                                       \
-                  '// Object Class: ' + str(callerobject.__class__.__name__)
+            print(ls +                                       \
+                  '// Object Class: ' + str(callerobject.__class__.__name__), file=self.debug_out)
 
         ## If the method has been extracted print it here
         if callermethod:
-            print >> self.debug_out, ls + '// '                                 \
-                  + self.maybe_color('green', 'Method: ') + str(callermethod)
+            print(ls + '// '                                 \
+                  + self.maybe_color('green', 'Method: ') + str(callermethod), file=self.debug_out)
             if self.debug_vrb == 3:
-                print >> self.debug_out, ls + '//---------------------------' + \
-                      '------------------------------------'
+                print(ls + '//---------------------------' + \
+                      '------------------------------------', file=self.debug_out)
 
         ## Print the information on all available local variables
         if callerlocals:
             if self.debug_vrb == 3:
-                print >> self.debug_out, ls + '//'
-                print >> self.debug_out, ls + '// VALUES '
+                print(ls + '//', file=self.debug_out)
+                print(ls + '// VALUES ', file=self.debug_out)
             for i,j in callerlocals.items():
-                print >> self.debug_out, ls + '// ------------------> '         \
-                      + self.maybe_color('turquoise', str(i)) + ':'
+                print(ls + '// ------------------> '         \
+                      + self.maybe_color('turquoise', str(i)) + ':', file=self.debug_out)
                 breaklines(str(j))
             if self.debug_vrb == 3:
-                print >> self.debug_out, ls + '//------------------------------'\
-                      '---------------------------------'
+                print(ls + '//------------------------------'\
+                      '---------------------------------', file=self.debug_out)
 
         # Finally print the message
         breaklines(self.maybe_color('yellow', message))
 
         if self.debug_vrb == 3:
-            print >> self.debug_out, ls + '//-------------------------------' + \
-                  '--------------------------------'
-            print >> self.debug_out, ls + '/////////////////////////////////' + \
-                  '////////////////////////////////'
+            print(ls + '//-------------------------------' + \
+                  '--------------------------------', file=self.debug_out)
+            print(ls + '/////////////////////////////////' + \
+                  '////////////////////////////////', file=self.debug_out)
 
 ## gloabal message handler
 OUT = Message('webapp-config')

diff --git a/WebappConfig/server.py b/WebappConfig/server.py
index 2272d76..f67ecdb 100644
--- a/WebappConfig/server.py
+++ b/WebappConfig/server.py
@@ -49,7 +49,7 @@ class Basic:
                  pm):
 
         if self.dep and not self.supported(pm):
-            print self.dep
+            print(self.dep)
             OUT.die('Your configuration file sets the server type "' + self.name
                     + '"\nbut the corresponding package does not seem to be '
                     'installed!\nPlease "emerge ' + self.dep + '" or correct '

diff --git a/WebappConfig/version.py b/WebappConfig/version.py
index c09a903..ddf6c9d 100644
--- a/WebappConfig/version.py
+++ b/WebappConfig/version.py
@@ -16,4 +16,4 @@
 WCVERSION = '1.50.18'
 
 if __name__ == '__main__':
-    print WCVERSION
+    print(WCVERSION)