xython 2.2.1__tar.gz → 2.2.3__tar.gz

{xython-2.2.1/src/xython.egg-info → xython-2.2.3}/PKG-INFO

@@ -1,15 +1,14 @@
 Metadata-Version: 2.1
 Name: xython
-Version: 2.2.1
+Version: 2.2.3
 Summary: Functional Programming for Excel, Word, Outlook, Color, Etc with Python
 Home-page: https://github.com/sjpark/xython
 Author: sjpark
 Author-email: sjpkorea@yahoo.com
 License: UNKNOWN
-Download-URL: https://github.com/sjpark/xython/archive/v2.2.1.tar.gz
+Download-URL: https://github.com/sjpark/xython/archive/v2.2.3.tar.gz
 Project-URL: Documentation, https://sjpkorea.github.io/xython.github.io/
 Project-URL: Link 1, https://www.xython.co.kr
-Project-URL: Link 2, https://www.halmoney.com
 Description: ## About xython module / 개요
         Functional Programming for Excel, Hwp, Word, Outlook, Color, Etc by Python
         

{xython-2.2.1 → xython-2.2.3}/setup.py

@@ -9,9 +9,9 @@ with open("README.md", "rt", encoding='UTF8') as fh:
     long_description = fh.read()
 setup(
     name='xython',
-    version='2.2.1',
+    version='2.2.3',
     url='https://github.com/sjpark/xython',
-    download_url='https://github.com/sjpark/xython/archive/v2.2.1.tar.gz',
+    download_url='https://github.com/sjpark/xython/archive/v2.2.3.tar.gz',
     author='sjpark',
     author_email='sjpkorea@yahoo.com',
     description='Functional Programming for Excel, Word, Outlook, Color, Etc with Python',
@@ -30,7 +30,6 @@ setup(
     project_urls = {
       'Documentation': 'https://sjpkorea.github.io/xython.github.io/',
       'Link 1': 'https://www.xython.co.kr',
-      'Link 2': 'https://www.halmoney.com'
     }
     )
 

{xython-2.2.1 → xython-2.2.3}/src/xython/__init__.py

@@ -6,7 +6,7 @@ import inspect
 import os
 import sys
 
-__version__ = '2.2.1'
+__version__ = '2.2.3'
 real_path = os.path.dirname(os.path.abspath(__file__)).replace("\\","/")
 sys.path.append(real_path)
 

{xython-2.2.1 → xython-2.2.3}/src/xython/anydb.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import os, sqlite3  # 내장모듈
 
-import pcell,jfinder, scolor, youtil, basic_data  # xython 모듈
-
+from xython import pcell,jfinder, scolor, youtil  # xython 모듈
+import xython_basic_data
 import pandas as pd
 import numpy as np
 
@@ -23,7 +23,7 @@ class anydb:
 		self.table_name = ""
 		self.con = ""  # sqlite db에 연결되는 것
 
-		self.common_data = basic_data.basic_data()
+		self.common_data = xython_basic_data.basic_data_basic_data()
 		self.var_common = self.common_data.vars  # 패키지내에서 공통으로 사용되는 변수
 
 		if self.db_name != "":
@@ -135,18 +135,18 @@ class anydb:
 
 		return result
 
-	def change_list_to_df(self, col_list="", list2d=""):
+	def change_list_to_df(self, col_list="", list_2d=""):
 		"""
 		리스트 자료를 dataframe로 만드는것
 
 		:param col_list: 제목리스트
-		:param list2d: 2차원 값리스트형
+		:param list_2d: 2차원 값리스트형
 		:return: dataframe로 바꾼것
 		"""
-		checked_list2d = self.util.change_list1d_to_list2d(list2d)
+		checked_list_2d = self.util.change_list_1d_to_list_2d(list_2d)
 		# 컬럼의 이름이 없거나하면 기본적인 이름을 만드는 것이다
-		checked_col_list = self.check_input_data(col_list, list2d)
-		input_df = pd.DataFrame(data=checked_list2d, columns=checked_col_list)
+		checked_col_list = self.check_input_data(col_list, list_2d)
+		input_df = pd.DataFrame(data=checked_list_2d, columns=checked_col_list)
 		return input_df
 
 	def change_sqlite_table_data_to_df(self, table_name, db_name=""):
@@ -719,7 +719,7 @@ class anydb:
 		:param col_list: y컬럼 이름들
 		:return:
 		"""
-		sql_columns = self.util.change_list1d_to_text_with_chainword(col_list, ", ")
+		sql_columns = self.util.change_list_1d_to_text_with_chainword(col_list, ", ")
 		sql_values = "?," * len(col_list)
 		result = "insert into %s (%s) values (%s)" % (table_name, sql_columns, sql_values[:-1])
 		return result
@@ -1002,7 +1002,7 @@ class anydb:
 		if yname_s == "":
 			sql_columns = "*"
 		else:
-			sql_columns = self.util.change_list1d_to_text_with_chainword(yname_s, ", ")
+			sql_columns = self.util.change_list_1d_to_text_with_chainword(yname_s, ", ")
 
 		if condition == "all":
 			lim_no = 100
@@ -1266,7 +1266,7 @@ class anydb:
 		col_list = input_df.columns.values.tolist()
 		value_list = input_df.values.tolist()
 		excel = pcell.pcell()
-		excel.write_list1d_in_yline("", xy, col_list)
+		excel.write_list_1d_in_yline("", xy, col_list)
 		excel.write_value_in_range_as_speedy("", [xy[0] + 1, xy[1]], value_list)
 
 	def write_df_data_to_sqlite(self, table_name, df_data, db_name=""):