summaryrefslogtreecommitdiff
path: root/kpov_judge/tasks/nat_vlc
diff options
context:
space:
mode:
authorTimotej Lazar <timotej.lazar@fri.uni-lj.si>2018-09-26 16:23:29 +0200
committerTimotej Lazar <timotej.lazar@fri.uni-lj.si>2018-09-26 16:23:29 +0200
commit03c9d6d8441e3293b058fed270866419781b734c (patch)
treea456f12f5c26c836685c6e47c95cfe2897e43723 /kpov_judge/tasks/nat_vlc
parent3938c69f3e1586c1ffbcae5395414ca8480e6ba4 (diff)
Run 2to3
Some stuff is broken now.
Diffstat (limited to 'kpov_judge/tasks/nat_vlc')
-rw-r--r--kpov_judge/tasks/nat_vlc/task.py4
-rw-r--r--kpov_judge/tasks/nat_vlc/video.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/kpov_judge/tasks/nat_vlc/task.py b/kpov_judge/tasks/nat_vlc/task.py
index 59cceaa..cf3947b 100644
--- a/kpov_judge/tasks/nat_vlc/task.py
+++ b/kpov_judge/tasks/nat_vlc/task.py
@@ -9,7 +9,7 @@
#TODO: finish this
instructions = {
- 'si':u"""
+ 'si':"""
Postavi dva navidezna računalnika - SimpleArbiter z diskom simpleArbiter
ter NATServer. NATServer naj ima dva omrežna vmesnika - z enim naj bo povezan
na lokalno omrežje, na katerem naj bo tudi simpleArbiter, z drugim pa na
@@ -20,7 +20,7 @@ ustvarite še uporabnika {IP_NAT_user}.
Poskrbi, da bo SimpleArbiter prek DHCP dobil naslov {IP_simple}.
Poskrbi, da bo NATServer deloval kot prehod za SimpleArbiter in izvajal NAT.
""",
- 'en':u"""
+ 'en':"""
Set up two virtual machines - SimpleArbiter (using the disc simpleArbiter) and
NATServer. NATServer should have two network adapters. Connect the first
adapter to SimpleArbiter and the second adapter to the Internet. Configure the
diff --git a/kpov_judge/tasks/nat_vlc/video.py b/kpov_judge/tasks/nat_vlc/video.py
index 7593d43..3c21c82 100644
--- a/kpov_judge/tasks/nat_vlc/video.py
+++ b/kpov_judge/tasks/nat_vlc/video.py
@@ -31,7 +31,7 @@ bashCommand = "avconv -i video.mp4 -c:a copy video1.avi"
os.system(bashCommand)
# This loop will increas videos length by adding more picesec of the original video.
-last = input("Set video length in seconds: ")
+last = int(input("Set video length in seconds: "))
bashCommand = "avconv -i concat:video.avi\|video1.avi -c copy video.avi"
for i in range(0, last-2):
os.system(bashCommand)