embedded pydes

denisenkom · Jan 29, 2014 · 66eabc0 · 66eabc0
1 parent dc09d2a
commit 66eabc0
Show file tree

Hide file tree

Showing 5 changed files with 853 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,5 +7,4 @@ install:
   - "pip install -r requirements.txt --use-mirrors"
   - "pip install -r test_requirements.txt --use-mirrors"
   - "pip install -r test_requirements26.txt --use-mirrors; true"
-  - "pip install pydes --use-mirrors"
 script: nosetests
diff --git a/ci.bat b/ci.bat
@@ -1,6 +1,5 @@
 %PYTHONHOME%\scripts\virtualenv env
 call env\scripts\activate.bat
-pip install pydes --use-mirrors
 pip install coverage --use-mirrors
 pip install -r requirements.txt --use-mirrors
 pip install -r test_requirements.txt --use-mirrors

diff --git a/ci.sh b/ci.sh
@@ -3,7 +3,6 @@ set -e
 
 $PYTHONHOME/bin/virtualenv env
 . env/bin/activate
-pip install pydes --use-mirrors
 pip install coverage --use-mirrors
 pip install -r requirements.txt --use-mirrors
 pip install -r test_requirements.txt --use-mirrors

diff --git a/pytds/ntlm.py b/pytds/ntlm.py
@@ -14,17 +14,14 @@
 import struct
 import base64
 import string
-try:
-    import pyDes
-except:
-    raise Exception('To use ntlm authentication you should install pyDes module: pip install pydes')
 import hashlib
 import hmac
 import random
 import re
 import binascii
 from socket import gethostname
 from six import print_, int2byte
+from . import pyDes
 
 NTLM_NegotiateUnicode                = 0x00000001
 NTLM_NegotiateOEM                    = 0x00000002