mdbq 4.0.22__py3-none-any.whl → 4.0.23__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.22'
+VERSION = '4.0.23'

mdbq/myconf/myconf2.py

@@ -233,7 +233,7 @@ class ConfigParser:
             self._comments_cache.clear()
             self._section_map.clear()
     
-    def _convert_value(self, value: str, target_type: Type[T]) -> T:
+    def _convert_value(self, value: str, target_type: Type[T], file_path: Optional[Union[str, Path]] = None, key: Optional[str] = None) -> T:
         """转换配置值到指定类型"""
         try:
             if target_type == bool:
@@ -252,13 +252,14 @@ class ConfigParser:
                     if sep in value:
                         return tuple(item.strip() for item in value.split(sep) if item.strip())
                 return (value.strip(),)
-            elif target_type == set:
+            elif target_type == set or target_type == frozenset:
                 if not value.strip():
-                    return set()
+                    return set() if target_type == set else frozenset()
                 for sep in [',', ';', '|', ' ']:
                     if sep in value:
-                        return {item.strip() for item in value.split(sep) if item.strip()}
-                return {value.strip()}
+                        items = [item.strip() for item in value.split(sep) if item.strip()]
+                        return set(items) if target_type == set else frozenset(items)
+                return set([value.strip()]) if target_type == set else frozenset([value.strip()])
             elif target_type == dict:
                 if not value.strip():
                     return {}
@@ -268,12 +269,12 @@ class ConfigParser:
                         pairs = [pair.strip() for pair in value.split(sep) if pair.strip()]
                         for pair in pairs:
                             if '=' in pair:
-                                key, val = pair.split('=', 1)
-                                result[key.strip()] = val.strip()
+                                key_, val = pair.split('=', 1)
+                                result[key_.strip()] = val.strip()
                         return result
                 if '=' in value:
-                    key, val = value.split('=', 1)
-                    return {key.strip(): val.strip()}
+                    key_, val = value.split('=', 1)
+                    return {key_.strip(): val.strip()}
                 return {}
             elif target_type == int:
                 value = value.strip().lower()
@@ -292,10 +293,6 @@ class ConfigParser:
                 return value.encode('utf-8')
             elif target_type == bytearray:
                 return bytearray(value.encode('utf-8'))
-            elif target_type == set:
-                return set(value.split(','))
-            elif target_type == frozenset:
-                return frozenset(value.split(','))
             elif target_type == range:
                 parts = value.split(':')
                 if len(parts) == 2:
@@ -307,8 +304,8 @@ class ConfigParser:
         except (ValueError, TypeError) as e:
             raise ConfigValueError(
                 f"无法将值 '{value}' 转换为类型 {target_type.__name__}",
-                file_path=None,
-                key=None
+                file_path=file_path,
+                key=key
             )
     
     def get_value(self, file_path: Optional[Union[str, Path]] = None, key: str = None, 
@@ -320,27 +317,21 @@ class ConfigParser:
             file_path = self._current_file
         if not self._validate_key(key):
             raise ConfigValueError(f"无效的键名: {key}", file_path=file_path, key=key)
-            
         config = self.read(file_path)
         section = section or self.options.default_section
         normalized_section = self._normalize_section(section)
-        
         original_section = self._get_original_section(str(file_path), normalized_section)
         if original_section is None:
             if default is not None:
                 return default
             raise ConfigSectionNotFoundError(file_path, section)
-            
         if key not in config[original_section]:
             if default is not None:
                 return default
             raise ConfigKeyNotFoundError(file_path, original_section, key)
-            
         value = config[original_section][key]
-        
         if value_type is not None:
-            return self._convert_value(value, value_type)
-            
+            return self._convert_value(value, value_type, file_path=file_path, key=key)
         return value
     
     def get_values(self, keys: List[Tuple[str, str]], 
@@ -414,17 +405,14 @@ class ConfigParser:
             file_path = self._current_file
         if not self._validate_key(key):
             raise ConfigValueError(f"无效的键名: {key}", file_path=file_path, key=key)
-            
+        section = section or self.options.default_section
         original_lines = []
         if file_path.exists():
             with open(file_path, 'r', encoding=self.options.encoding) as file:
                 original_lines = file.readlines()
-        
         config = self.read(file_path)
-        
         if section not in config:
             config[section] = {}
-            
         if value_type is not None:
             try:
                 if value_type == bool:
@@ -441,37 +429,28 @@ class ConfigParser:
                     section=section,
                     key=key
                 )
-        
         if isinstance(value, bool):
             value = str(value).lower()
         else:
             value = str(value)
-            
         config[section][key] = value
-        
         try:
             file_path.parent.mkdir(parents=True, exist_ok=True)
-            
             with open(file_path, 'w', encoding=self.options.encoding) as file:
                 current_section = self.options.default_section
                 section_separators = {}
-                
                 for line in original_lines:
                     stripped_line = line.strip()
-                    
                     if not stripped_line:
                         file.write(line)
                         continue
-                        
                     if stripped_line.startswith('[') and stripped_line.endswith(']'):
                         current_section = stripped_line[1:-1]
                         file.write(line)
                         continue
-                        
                     if self._is_comment_line(stripped_line):
                         file.write(line)
                         continue
-                        
                     key_value = self._split_key_value(stripped_line)
                     if key_value:
                         orig_key, orig_value = key_value
@@ -479,7 +458,6 @@ class ConfigParser:
                             if sep in line:
                                 section_separators.setdefault(current_section, {})[orig_key] = sep
                                 break
-                        
                         if current_section == section and orig_key == key:
                             separator = section_separators.get(current_section, {}).get(orig_key, self.options.separators[0])
                             comment = ''
@@ -493,13 +471,10 @@ class ConfigParser:
                             file.write(line)
                     else:
                         file.write(line)
-                
                 if section not in [line.strip()[1:-1] for line in original_lines if line.strip().startswith('[') and line.strip().endswith(']')]:
                     file.write(f'\n[{section}]\n')
                     file.write(f'{key}={value}\n')
-            
             self._clear_cache(str(file_path))
-            
         except Exception as e:
             raise ConfigWriteError(file_path, e)
     
@@ -585,35 +560,34 @@ class ConfigParser:
 def main() -> None:
     """示例用法"""
     config_file = Path('/Users/xigua/spd.txt')
-    
-    # 方式1：使用上下文管理器
-    with ConfigParser() as parser:
-        parser.open(config_file)
-        host, port, username, password = parser.get_section_values(
+    try:
+        # 方式1：使用上下文管理器
+        with ConfigParser() as parser:
+            parser.open(config_file)
+            host, port, username, password = parser.get_section_values(
+                keys=['host', 'port', 'username', 'password'],
+                section='mysql'
+            )
+            print("方式1结果:", host, port, username, password)
+            parser.set_value('username', 'root', section='mysql')
+            parser.set_value('port', 3306, section='mysql')
+        # 方式2：链式调用
+        parser = ConfigParser()
+        host, port, username, password = parser.open(config_file).get_section_values(
             keys=['host', 'port', 'username', 'password'],
             section='mysql'
         )
-        print("方式1结果:", host, port, username, password)
-        
-        parser.set_value('username', 'root', section='mysql')
-        parser.set_value('port', 3306, section='mysql')
-    
-    # 方式2：链式调用
-    parser = ConfigParser()
-    host, port, username, password = parser.open(config_file).get_section_values(
-        keys=['host', 'port', 'username', 'password'],
-        section='mysql'
-    )
-    print("\n方式2结果:", host, port, username, password)
-    
-    # 方式3：传统方式
-    parser = ConfigParser()
-    host, port, username, password = parser.get_section_values(
-        file_path=config_file,
-        section='mysql',
-        keys=['host', 'port', 'username', 'password']
-    )
-    print("\n方式3结果:", host, port, username, password)
+        print("\n方式2结果:", host, port, username, password)
+        # 方式3：传统方式
+        parser = ConfigParser()
+        host, port, username, password = parser.get_section_values(
+            file_path=config_file,
+            section='mysql',
+            keys=['host', 'port', 'username', 'password']
+        )
+        print("\n方式3结果:", host, port, username, password)
+    except Exception as e:
+        print(f"配置文件操作异常: {e}")
 
 
 if __name__ == '__main__':

{mdbq-4.0.22.dist-info → mdbq-4.0.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mdbq
-Version: 4.0.22
+Version: 4.0.23
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-4.0.22.dist-info → mdbq-4.0.23.dist-info}/RECORD

@@ -1,12 +1,12 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=gSoWvHL6N2Idp7W1joFJ-FzlUGBvhO24bsaGJ6I1x-Y,18
+mdbq/__version__.py,sha256=DL1LeguYb9YeIqFpwczMwHkRTX7qAUfv5A5WC00M-Po,18
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
 mdbq/aggregation/query_data.py,sha256=hdaB0vPh5BcTu9kLViRvM7OAE0b07D4jzAIipqxGI-I,166757
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=9w_o5mYB3FooIxobq_lSa6oCYTKIhPxDFox-jeLtUHI,21714
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/myconf/myconf.py,sha256=39tLUBVlWQZzQfrwk7YoLEfipo11fpwWjaLBHcUt2qM,33341
-mdbq/myconf/myconf2.py,sha256=kaHhOvKMVOilu9JYKfsefF08tUyC99B8aWUZJvc_oh8,25481
+mdbq/myconf/myconf2.py,sha256=LQPNO5c9uATglZ1IrOgGslj6aSuAfpBXgHnPwvCrHmA,25482
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
 mdbq/mysql/deduplicator.py,sha256=kAnkI_vnN8CchgDQAFzeh0M0vLXE2oWq9SfDPNZZ3v0,73215
 mdbq/mysql/mysql.py,sha256=pDg771xBugCMSTWeskIFTi3pFLgaqgyG3smzf-86Wn8,56772
@@ -25,7 +25,7 @@ mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=juOqpr_dHeE1RyjCu67VcpzoJAWMO7FKv0i8KiH8WUo,21552
-mdbq-4.0.22.dist-info/METADATA,sha256=EVHw5Bw16kqgOfKjnTmRY9SpDDpj882dD0UjB_ogT6w,364
-mdbq-4.0.22.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-4.0.22.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.22.dist-info/RECORD,,
+mdbq-4.0.23.dist-info/METADATA,sha256=Dx9QagRQoN_ttdDOi6RnTKDgSzfqBqn0bp7ozDrZq7Q,364
+mdbq-4.0.23.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.0.23.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.23.dist-info/RECORD,,