Merge pull request #86 from RobSullivan/master
Python3.5 syntax changes
This commit is contained in:
		
						commit
						f1d62380c9
					
				
					 2 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
					@ -3,7 +3,7 @@
 | 
				
			||||||
from datetime import datetime
 | 
					from datetime import datetime
 | 
				
			||||||
try:
 | 
					try:
 | 
				
			||||||
    from Crypto.Cipher import AES
 | 
					    from Crypto.Cipher import AES
 | 
				
			||||||
except ImportError, e:
 | 
					except ImportError as e:
 | 
				
			||||||
    import pyaes
 | 
					    import pyaes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import time
 | 
					import time
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								setup.py
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								setup.py
									
										
									
									
									
								
							| 
						 | 
					@ -9,7 +9,7 @@ import warnings
 | 
				
			||||||
try:
 | 
					try:
 | 
				
			||||||
    import pyaes
 | 
					    import pyaes
 | 
				
			||||||
    dynamic_requires = ["pyaes==1.6.0"]
 | 
					    dynamic_requires = ["pyaes==1.6.0"]
 | 
				
			||||||
except ImportError, e:
 | 
					except ImportError as e:
 | 
				
			||||||
    dynamic_requires = ['pycrypto==2.6.1']
 | 
					    dynamic_requires = ['pycrypto==2.6.1']
 | 
				
			||||||
 | 
					
 | 
				
			||||||
version = 0.3
 | 
					version = 0.3
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue