← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~googol/openlp/vlc into lp:openlp

 

Andreas Preikschat has proposed merging lp:~googol/openlp/vlc into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/vlc/+merge/127246

Hello,

- updated vlc.py from master


"python: make module python 2.6 compatible

sys.version_info.major (namedtuple) was introduced in 2.7. This is the only compatibility issue, so fix it.

Suggested by David Mills <tvtronix-ad-yahoo-dot-com>"
http://git.videolan.org/?p=vlc/bindings/python.git;a=commit;h=2fb732e2eff2d82fb361168932d9f2eeccb8ff16
-- 
https://code.launchpad.net/~googol/openlp/vlc/+merge/127246
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/vlc into lp:openlp.
=== modified file 'openlp/core/ui/media/vlc.py'
--- openlp/core/ui/media/vlc.py	2012-09-19 06:34:45 +0000
+++ openlp/core/ui/media/vlc.py	2012-10-01 11:43:55 +0000
@@ -48,9 +48,9 @@
 from inspect import getargspec
 
 __version__ = "N/A"
-build_date  = "Mon Sep 10 16:51:25 2012"
+build_date  = "Fri Sep 28 22:48:50 2012"
 
-if sys.version_info.major > 2:
+if sys.version_info[0] > 2:
     str = str
     unicode = str
     bytes = bytes


Follow ups