Merge branch 'eric'
This commit is contained in:
		
						commit
						f95fe6d531
					
				|  | @ -282,16 +282,16 @@ Left-Drag to Move" | |||
| 	        </layout> | ||||
| 	        <layout fav_seat="0" height="546" max="10" width="792"> | ||||
| 			<location seat="0" x="182" y="69"> </location> | ||||
| 	        	<location seat="1" x="456" y="74">  </location> | ||||
| 	        	<location seat="2" x="630" y="81"> </location> | ||||
| 	        	<location seat="3" x="637" y="208"> </location> | ||||
| 	        	<location seat="4" x="629" y="347"> </location> | ||||
| 	        	<location seat="5" x="412" y="377"> </location> | ||||
| 	        	<location seat="6" x="232" y="377"> </location> | ||||
| 	        	<location seat="7" x="21" y="349"> </location> | ||||
| 	        	<location seat="8" x="4" y="208">  </location> | ||||
| 	        	<location seat="9" x="7" y="88">  </location> | ||||
| 	        	<location seat="10" x="196" y="69">  </location> | ||||
| 	        	<location seat="1" x="485" y="66">  </location> | ||||
| 	        	<location seat="2" x="661" y="79"> </location> | ||||
| 	        	<location seat="3" x="675" y="210"> </location> | ||||
| 	        	<location seat="4" x="644" y="346"> </location> | ||||
| 	        	<location seat="5" x="449" y="375"> </location> | ||||
| 	        	<location seat="6" x="253" y="374"> </location> | ||||
| 	        	<location seat="7" x="46" y="348"> </location> | ||||
| 	        	<location seat="8" x="23" y="204">  </location> | ||||
| 	        	<location seat="9" x="38" y="79">  </location> | ||||
| 	        	<location seat="10" x="226" y="67">  </location> | ||||
| 	        </layout> | ||||
| 	        <layout fav_seat="0" height="546" max="8" width="792"> | ||||
| 			<location seat="0" x="182" y="69"> </location> | ||||
|  |  | |||
|  | @ -32,8 +32,14 @@ from xml.dom.minidom import Node | |||
| 
 | ||||
| import time | ||||
| import datetime | ||||
| from pytz import timezone | ||||
| import pytz | ||||
| 
 | ||||
| try: | ||||
|     from pytz import timezone | ||||
|     import pytz | ||||
| except ImportError: | ||||
|     print _("ImportError: Unable to import PYTZ library.  Please install PYTZ from http://pypi.python.org/pypi/pytz/") | ||||
|     raw_input(_("Press ENTER to continue.")) | ||||
|     exit()    | ||||
| 
 | ||||
| import logging | ||||
| # logging has been set up in fpdb.py or HUD_main.py, use their settings: | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user