Fix incorrect nesting in local_patch.xml

mollyproject · Nov 23, 2010 · 47bbf31 · 47bbf31
1 parent 1564fdf
commit 47bbf31
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/molly/wurfl/local_patch.xml b/molly/wurfl/local_patch.xml
@@ -28,8 +28,8 @@
 
         <!-- Opera Mobile -->
         <device user_agent="Opera/9.80 (S60; SymbOS; Opera Mobi/499; U) Presto/2.4.18 Version/10.009" fall_back="generic_opera_mobi" id="opera_mobi_ver10"/>
-        
-	</devices>
+	
+
 
   <!-- IOS 4.2.1, temporary patch until it gets into the main WURFL -->
   <device id="apple_iphone_ver4_2_1" user_agent="Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; en_us) AppleWebKit/533.17.9 (KHTML, like Gecko)" fall_back="apple_iphone_ver4_2">
@@ -55,6 +55,7 @@
     </group>
   </device>
   <device id="apple_ipod_touch_ver4_2_1_subua" user_agent="Mozilla/5.0 (iPod touch; U; CPU iPhone OS 4_2_1 like Mac OS X; en_us) AppleWebKit/533.17.9 (KHTML, like Gecko)" fall_back="apple_ipod_touch_ver4_2_1"/>
-
+
+	</devices>
 
 </wurfl_patch>
diff --git a/molly/wurfl/wurfl_data.py b/molly/wurfl/wurfl_data.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 """
-/tmp/tmperBEAc/wurfl.py
+/tmp/tmp0FgU0f/wurfl.py
 
-Generated on: Tue Nov 23 10:43:01 2010
+Generated on: Tue Nov 23 10:49:34 2010
 Generated by: wurfl2python.py v5.0.0a
 """
 
@@ -13984,6 +13984,10 @@
 devices.devids[ur'''google_chrome_3'''] = devclass(devices.devids[ur'''google_chrome_2'''], ur'''google_chrome_3''', ur'''Mozilla/5.0 (Windows; U; Windows NT 5.1) AppleWebKit/532.0 (KHTML, like Gecko) Chrome/3.0.195.32 Safari/532.0''', False, None)
 devices.devids[ur'''google_chrome_4'''] = devclass(devices.devids[ur'''google_chrome_2'''], ur'''google_chrome_4''', ur'''Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/533.4 (KHTML, like Gecko) Chrome/5.0.375.38 Safari/533.4''', False, None)
 devices.devids[ur'''opera_mobi_ver10'''] = devclass(devices.devids[ur'''generic_opera_mobi'''], ur'''opera_mobi_ver10''', ur'''Opera/9.80 (S60; SymbOS; Opera Mobi/499; U) Presto/2.4.18 Version/10.009''', False, None)
+devices.devids[ur'''apple_iphone_ver4_2_1'''] = devclass(devices.devids[ur'''apple_iphone_ver4_2'''], ur'''apple_iphone_ver4_2_1''', ur'''Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; en_us) AppleWebKit/533.17.9 (KHTML, like Gecko)''', False, {ur'''device_os_version''':ur'''4.2.1''',ur'''model_extra_info''':ur'''4.2.1''',ur'''release_date''':ur'''2010_november'''})
+devices.devids[ur'''apple_ipad_ver1_sub421'''] = devclass(devices.devids[ur'''apple_ipad_ver1_sub42'''], ur'''apple_ipad_ver1_sub421''', ur'''Mozilla/5.0 (iPad; U; CPU iPhone OS 4_2_1 like Mac OS X; en_us) AppleWebKit/533.17.9 (KHTML, like Gecko)''', False, {ur'''device_os_version''':ur'''4.2.1''',ur'''release_date''':ur'''2010_november'''})
+devices.devids[ur'''apple_ipod_touch_ver4_2_1'''] = devclass(devices.devids[ur'''apple_ipod_touch_ver4_1'''], ur'''apple_ipod_touch_ver4_2_1''', ur'''Mozilla/5.0 (iPod; U; CPU iPhone OS 4_2_1 like Mac OS X; en_us) AppleWebKit/533.17.9 (KHTML, like Gecko)''', False, {ur'''device_os_version''':ur'''4.2.1''',ur'''model_extra_info''':ur'''4.2.1''',ur'''release_date''':ur'''2010_november'''})
+devices.devids[ur'''apple_ipod_touch_ver4_2_1_subua'''] = devclass(devices.devids[ur'''apple_ipod_touch_ver4_2_1'''], ur'''apple_ipod_touch_ver4_2_1_subua''', ur'''Mozilla/5.0 (iPod touch; U; CPU iPhone OS 4_2_1 like Mac OS X; en_us) AppleWebKit/533.17.9 (KHTML, like Gecko)''', False, None)
 devices.devids['''generic'''].groups[ur'''bearer'''] = [ur'''sdio''', ur'''wifi''', ur'''has_cellular_radio''', ur'''max_data_rate''', ur'''vpn''']
 devices.devids['''generic'''].groups[ur'''sms'''] = [ur'''ems''', ur'''text_imelody''', ur'''nokiaring''', ur'''siemens_logo_height''', ur'''ems_variablesizedpictures''', ur'''sckl_groupgraphic''', ur'''siemens_ota''', ur'''sagem_v1''', ur'''largeoperatorlogo''', ur'''sagem_v2''', ur'''ems_version''', ur'''ems_odi''', ur'''nokiavcal''', ur'''operatorlogo''', ur'''siemens_logo_width''', ur'''ems_imelody''', ur'''sckl_vcard''', ur'''siemens_screensaver_width''', ur'''sckl_operatorlogo''', ur'''panasonic''', ur'''ems_upi''', ur'''nokiavcard''', ur'''callericon''', ur'''sms_enabled''', ur'''gprtf''', ur'''siemens_screensaver_height''', ur'''sckl_ringtone''', ur'''picturemessage''', ur'''sckl_vcalendar''']
 devices.devids['''generic'''].groups[ur'''streaming'''] = [ur'''streaming_vcodec_mpeg4_asp''', ur'''streaming_video_size_limit''', ur'''streaming_mov''', ur'''streaming_wmv''', ur'''streaming_acodec_aac''', ur'''streaming_vcodec_h263_0''', ur'''streaming_real_media''', ur'''streaming_3g2''', ur'''streaming_3gpp''', ur'''streaming_acodec_amr''', ur'''streaming_vcodec_h264_bp''', ur'''streaming_vcodec_h263_3''', ur'''streaming_preferred_protocol''', ur'''streaming_vcodec_mpeg4_sp''', ur'''streaming_flv''', ur'''streaming_video''', ur'''streaming_mp4''']