I'm attaching the patch, which fixes some SyntaxErrors and 1 NameError with Python 3. This patch removes some print statements, which seem to be leftover from debugging.
-- Arfrever Frehtes Taifersar Arahesis
Index: lib/_vlcbackend.py
===================================================================
--- lib/_vlcbackend.py (revision 3076)
+++ lib/_vlcbackend.py (working copy)
@@ -15,7 +15,6 @@
class Communicator:
def __init__(self, player, remote, extra, port, hostname):
self.socket = socket.socket()
- #print (hostname, port)
while 1:
try:
self.socket.connect((hostname, port))
@@ -23,7 +22,6 @@
except socket.error:
port+=1
self.commands = ' '.join([player, remote, extra%(hostname, port)])
- print self.commands
self.patterns = {
'size' : re.compile("Resolution: \d{1,4}x\d{1,4}"),
'width' : re.compile("Resolution: \d{1,4}(?=\d{1,4})"),
@@ -191,4 +189,4 @@
if("status change: ( stop state: 0 )" in s):
if("nothing to play" in s):
self.comm.add(self.filename)
-
\ No newline at end of file
+
Index: lib/nmovie.py
===================================================================
--- lib/nmovie.py (revision 3076)
+++ lib/nmovie.py (working copy)
@@ -12,10 +12,10 @@
from pygame._vlcbackend import Movie, MovieWatcher
except ImportError:
#you're really hooped now...
- print "Unable to find a working movie backend. Loading the dummy movie class..."
+ print("Unable to find a working movie backend. Loading the dummy movie class...")
from pygame._dummybackend import Movie
else:
- print "Unable to find a working movie backend. Loading the dummy movie class..."
+ print("Unable to find a working movie backend. Loading the dummy movie class...")
from pygame._dummybackend import Movie
else:
#POSIX
@@ -24,9 +24,9 @@
from pygame._vlcbackend import Movie, MovieWatcher
except ImportError:
#oh man, I didn't mean for this to happen so badly...
- print "Unable to find a working movie backend. Loading the dummy movie class..."
+ print("Unable to find a working movie backend. Loading the dummy movie class...")
from pygame._dummybackend import Movie
else:
- print "Unable to find a working movie backend. Loading the dummy movie class..."
+ print("Unable to find a working movie backend. Loading the dummy movie class...")
from pygame._dummybackend import Movie
Index: test/_dummymovietest.py
===================================================================
--- test/_dummymovietest.py (revision 3076)
+++ test/_dummymovietest.py (working copy)
@@ -107,7 +107,6 @@
pygame.mixer.quit()
movie_file = trunk_relative_path('examples/data/blue.mpg')
movie = gmovie.Movie(movie_file)
- print movie.width
self.assertEqual(movie.width, 200)
del movie
@@ -117,7 +116,6 @@
pygame.mixer.quit()
movie_file = trunk_relative_path('examples/data/blue.mpg')
movie = gmovie.Movie(movie_file)
- print movie.height
self.assertEqual(movie.height, 200)
del movie
Index: test/_vlcmovietest.py
===================================================================
--- test/_vlcmovietest.py (revision 3076)
+++ test/_vlcmovietest.py (working copy)
@@ -107,7 +107,6 @@
pygame.mixer.quit()
movie_file = trunk_relative_path('examples/data/blue.mpg')
movie = gmovie.Movie(movie_file)
- print movie.width
self.assertEqual(movie.width, 200)
del movie
@@ -117,7 +116,6 @@
pygame.mixer.quit()
movie_file = trunk_relative_path('examples/data/blue.mpg')
movie = gmovie.Movie(movie_file)
- print movie.height
self.assertEqual(movie.height, 200)
del movie
Index: trackmod/importer.py
===================================================================
--- trackmod/importer.py (revision 3076)
+++ trackmod/importer.py (working copy)
@@ -6,6 +6,11 @@
from trackmod import module, namereg
try:
+ from imp import reload
+except ImportError:
+ pass
+
+try:
collect_data
except NameError:
pass
@@ -41,8 +46,8 @@
try:
try:
reload(m)
- except ImportError, e:
- return None;
+ except ImportError:
+ return None
finally:
del sys.modules[fullname]
signature.asc
Description: This is a digitally signed message part.
