summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2013-08-15 01:07:47 +0200
committermathieui <mathieui@mathieui.net>2013-08-15 01:07:47 +0200
commit7820f985682947da3bc2cc427c5193fe9a56acdb (patch)
treeac556904ae6ef8b7ae893241c7a0c61e521422e3 /src
parent6f2cca61d4184e17205d5182eaf7fec86d629eb7 (diff)
downloadpoezio-7820f985682947da3bc2cc427c5193fe9a56acdb.tar.gz
poezio-7820f985682947da3bc2cc427c5193fe9a56acdb.tar.bz2
poezio-7820f985682947da3bc2cc427c5193fe9a56acdb.tar.xz
poezio-7820f985682947da3bc2cc427c5193fe9a56acdb.zip
Move shlex to poezio_shlex to avoid conflicts with the stdlib
Diffstat (limited to 'src')
-rw-r--r--src/common.py2
-rw-r--r--src/poezio_shlex.py (renamed from src/shlex.py)0
2 files changed, 1 insertions, 1 deletions
diff --git a/src/common.py b/src/common.py
index c438270f..88c3d0ea 100644
--- a/src/common.py
+++ b/src/common.py
@@ -18,7 +18,7 @@ import hashlib
import subprocess
import time
import string
-import shlex
+import poezio_shlex as shlex
ROOM_STATE_NONE = 11
ROOM_STATE_CURRENT = 10
diff --git a/src/shlex.py b/src/poezio_shlex.py
index 5b3c556c..5b3c556c 100644
--- a/src/shlex.py
+++ b/src/poezio_shlex.py