openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/gen1 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/gen1/+merge/225232

Fix setup.py for python3 to remove binary strings.
Fix desktop file
-- 
https://code.launchpad.net/~trb143/openlp/gen1/+merge/225232
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/gen1 into lp:openlp.

=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py	2014-05-02 06:42:17 +0000
+++ openlp/core/utils/__init__.py	2014-07-01 21:13:08 +0000
@@ -149,9 +149,9 @@
         # If they are equal, then this tree is tarball with the source for the release. We do not want the revision
         # number in the full version.
         if tree_revision == tag_revision:
-            full_version = tag_version
+            full_version = tag_version.decode('utf-8')
         else:
-            full_version = '%s-bzr%s' % (tag_version, tree_revision)
+            full_version = '%s-bzr%s' % (tag_version.decode('utf-8'), tree_revision.decode('utf-8'))
     else:
         # We're not running the development version, let's use the file.
         filepath = AppLocation.get_directory(AppLocation.VersionDir)

=== modified file 'resources/openlp.desktop'
--- resources/openlp.desktop	2011-06-11 07:07:32 +0000
+++ resources/openlp.desktop	2014-07-01 21:13:08 +0000
@@ -1,7 +1,5 @@
 [Desktop Entry]
 Categories=AudioVideo;
-Comment[de]=
-Comment=
 Exec=openlp %F
 GenericName[de]=Church lyrics projection
 GenericName=Church lyrics projection
@@ -9,11 +7,7 @@
 MimeType=application/x-openlp-service;
 Name[de]=OpenLP
 Name=OpenLP
-Path=
 StartupNotify=true
 Terminal=false
 Type=Application
-X-DBUS-ServiceName=
-X-DBUS-StartupType=
 X-KDE-SubstituteUID=false
-X-KDE-Username=

=== modified file 'setup.py'
--- setup.py	2014-04-02 18:51:21 +0000
+++ setup.py	2014-07-01 21:13:08 +0000
@@ -106,9 +106,9 @@
     # If they are equal, then this tree is tarball with the source for the release. We do not want the revision number
     # in the version string.
     if tree_revision == tag_revision:
-        version_string = tag_version
+        version_string = tag_version.decode('utf-8')
     else:
-        version_string = '%s-bzr%s' % (tag_version, tree_revision)
+        version_string = '%s-bzr%s' % (tag_version.decode('utf-8'), tree_revision.decode('utf-8'))
     ver_file = open(VERSION_FILE, 'w')
     ver_file.write(version_string)
 except:
@@ -152,7 +152,7 @@
         'Operating System :: POSIX :: BSD :: FreeBSD',
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3',
         'Topic :: Desktop Environment :: Gnome',
         'Topic :: Desktop Environment :: K Desktop Environment (KDE)',
         'Topic :: Multimedia',