openlp-core team mailing list archive

[Jeffrey Smith <whydoubt@xxxxxxxxx>]

Jeffrey Smith has proposed merging lp:~whydoubt/openlp/fix_scripts_python3 into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)

For more details, see:
https://code.launchpad.net/~whydoubt/openlp/fix_scripts_python3/+merge/184455

The dependency-checking script may not give a valuable result, since
it runs against 'python' whereas openlp runs against 'python3'.

It may appear at first glance that I removed the check for the 'bs4'
import, but it was actually in the list twice, so I deleted the second.
-- 
https://code.launchpad.net/~whydoubt/openlp/fix_scripts_python3/+merge/184455
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'scripts/check_dependencies.py'
--- scripts/check_dependencies.py	2013-08-31 18:17:38 +0000
+++ scripts/check_dependencies.py	2013-09-07 21:40:14 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
 
@@ -49,7 +49,7 @@
 IS_WIN = sys.platform.startswith('win')
 
 VERS = {
-    'Python': '2.6',
+    'Python': '3.0',
     'PyQt4': '4.6',
     'Qt4': '4.6',
     'sqlalchemy': '0.5',
@@ -63,6 +63,7 @@
     'win32ui',
     'pywintypes',
     'pyodbc',
+    'icu',
 ]
 
 MODULES = [
@@ -76,6 +77,7 @@
     'PyQt4.QtWebKit',
     'PyQt4.phonon',
     'sqlalchemy',
+    'alembic',
     'sqlite3',
     'lxml',
     'chardet',
@@ -84,8 +86,6 @@
     'mako',
     'cherrypy',
     'uno',
-    'icu',
-    'bs4',
 ]
 
 

=== modified file 'scripts/translation_utils.py'
--- scripts/translation_utils.py	2013-08-31 18:17:38 +0000
+++ scripts/translation_utils.py	2013-09-07 21:40:14 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
 
@@ -102,7 +102,7 @@
     def __iter__(self):
         return self
 
-    def next(self):
+    def __next__(self):
         if self.current_index == len(self.data):
             raise StopIteration
         else:
@@ -145,9 +145,9 @@
     global quiet_mode
     if not quiet_mode:
         if linefeed:
-            print text
+            print (text)
         else:
-            print text,
+            print (text, end=' ')
 
 def print_verbose(text):
     """

=== modified file 'setup.py'
--- setup.py	2013-08-31 18:17:38 +0000
+++ setup.py	2013-09-07 21:40:14 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4