Skip to content

S
s1zlibs
Commit 5774ab67 by Oleksandr Barabash
Options

rebuilt devbug log bumped

parent 8dafec2f
Showing with 45 additions and 355 deletions
.gitignore
**.pyc **.pyc
.idea
venv*
build/lib/s1zlibs/jsoner/serializers/simple_serializer.py
...@@ -19,8 +19,10 @@ class SimpleSerializer(BaseSerializer): ...@@ -19,8 +19,10 @@ class SimpleSerializer(BaseSerializer):
)) ))
@staticmethod @staticmethod
def raise_value_error(value): def raise_value_error(value, type_required):
raise AttributeError("Could not handle value: {}".format(value)) raise AttributeError("Could not handle value: {}. required: {}".format(
value.__name__, type_required.__name__
))
def get_value_type(self, value_type): def get_value_type(self, value_type):
# If the value type is an array # If the value type is an array
...@@ -31,14 +33,17 @@ class SimpleSerializer(BaseSerializer): ...@@ -31,14 +33,17 @@ class SimpleSerializer(BaseSerializer):
elif value_type in self.handle_types: elif value_type in self.handle_types:
return False, value_type return False, value_type
return self.raise_value_error(value_type) raise AttributeError(("No supported type detected: {}. "
"required one of these: '{}'").format(
value_type, ', '.join([x.__name__ for x in self.handle_types])
))
def check_type(self, values): def check_type(self, values):
# type: (list) -> list # type: (list) -> list
dumped = list() dumped = list()
for raw_data in values: for raw_data in values:
if not isinstance(raw_data, self.value_type): if not isinstance(raw_data, self.value_type):
self.raise_value_error(raw_data) self.raise_value_error(raw_data, self.value_type)
dumped.append(raw_data) dumped.append(raw_data)
return dumped return dumped
...@@ -50,7 +55,11 @@ class SimpleSerializer(BaseSerializer): ...@@ -50,7 +55,11 @@ class SimpleSerializer(BaseSerializer):
elif self.value_is_list and isinstance(value, list): elif self.value_is_list and isinstance(value, list):
return self.check_type(value) return self.check_type(value)
return self.raise_value_error(value) raise AttributeError(("No supported type detected: {}. "
"required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in self.handle_types])
))
def dumps(self, value): def dumps(self, value):
if not self.value_is_list and not isinstance(value, list): if not self.value_is_list and not isinstance(value, list):
...@@ -60,4 +69,8 @@ class SimpleSerializer(BaseSerializer): ...@@ -60,4 +69,8 @@ class SimpleSerializer(BaseSerializer):
elif self.value_is_list and isinstance(value, list): elif self.value_is_list and isinstance(value, list):
return self.check_type(value) return self.check_type(value)
return self.raise_value_error(value) raise AttributeError(("No supported type detected: {}. "
"required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in self.handle_types])
))
install_tools.sh 0 → 100755
#! /bin/bash
python -m pip install --user --upgrade setuptools
python -m pip install --user --upgrade wheel
s1zlibs.egg-info/PKG-INFO
Metadata-Version: 2.1 Metadata-Version: 2.1
Name: s1zlibs Name: s1zlibs
Version: 1.0.2 Version: 1.0.3
Summary: s1zlibs Summary: s1zlibs
Home-page: https://git.s1z.info/skal/s1zlibs Home-page: https://git.s1z.info/skal/s1zlibs
Author: Barabash Oleksandr Author: Barabash Oleksandr
......
s1zlibs/.idea/misc.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6.1 (/Library/Frameworks/Python.framework/Versions/3.6/bin/python3.6)" project-jdk-type="Python SDK" />
</project>
\ No newline at end of file
s1zlibs/.idea/modules.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/s1zlibs.iml" filepath="$PROJECT_DIR$/.idea/s1zlibs.iml" />
</modules>
</component>
</project>
\ No newline at end of file
s1zlibs/.idea/s1zlibs.iml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">
<option name="PROJECT_TEST_RUNNER" value="Unittests" />
</component>
</module>
\ No newline at end of file
s1zlibs/.idea/workspace.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="65d42553-dd76-4359-9c87-e7f5083fe8d6" name="Default" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
<entry file="file:///Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/logging/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="1457" selection-start-line="1457" selection-end-line="1462" selection-end-column="26" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/jsoner/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="40" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="base_serializable.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/jsoner/serializable/base_serializable.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" selection-start-line="6" selection-end-line="6" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="base_field.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/jsoner/fields/base_field.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="11" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
<folding>
<element signature="e#0#38#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="simple_serializer.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/jsoner/serializers/simple_serializer.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="1" column="8" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="8" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/jsoner/fields/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Python Script" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>lock</find>
<find>SerializableField</find>
</findStrings>
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/utils/log.py" />
<option value="$PROJECT_DIR$/utils/pbkdf2_hmac.py" />
<option value="$PROJECT_DIR$/jsoner/decorators.py" />
<option value="$PROJECT_DIR$/jsoner/serializers/base_serializer.py" />
<option value="$PROJECT_DIR$/jsoner/serializers/__init__.py" />
<option value="$PROJECT_DIR$/jsoner/fields/__init__.py" />
<option value="$PROJECT_DIR$/jsoner/fields/simple_field.py" />
<option value="$PROJECT_DIR$/jsoner/serializable/base_serializable.py" />
<option value="$PROJECT_DIR$/jsoner/__init__.py" />
<option value="$PROJECT_DIR$/jsoner/serializers/simple_serializer.py" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="y" value="23" />
<option name="width" value="1440" />
<option name="height" value="877" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="s1zlibs" type="b2602c69:ProjectViewProjectNode" />
<item name="s1zlibs" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="s1zlibs" type="b2602c69:ProjectViewProjectNode" />
<item name="s1zlibs" type="462c0819:PsiDirectoryNode" />
<item name="jsoner" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="s1zlibs" type="b2602c69:ProjectViewProjectNode" />
<item name="s1zlibs" type="462c0819:PsiDirectoryNode" />
<item name="jsoner" type="462c0819:PsiDirectoryNode" />
<item name="serializable" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="s1zlibs" type="b2602c69:ProjectViewProjectNode" />
<item name="s1zlibs" type="462c0819:PsiDirectoryNode" />
<item name="jsoner" type="462c0819:PsiDirectoryNode" />
<item name="serializers" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PythonContentEntriesConfigurable" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/jsoner" />
<recent name="$PROJECT_DIR$/utils" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="65d42553-dd76-4359-9c87-e7f5083fe8d6" name="Default" comment="" />
<created>1546539823731</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1546539823731</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="877" extended-state="6" />
<editor active="true" />
<layout>
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
<window_info anchor="bottom" id="Python Console" />
<window_info anchor="bottom" id="Terminal" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="right" id="Database" />
<window_info anchor="right" id="SciView" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" side_tool="true" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$APPLICATION_HOME_DIR$/helpers/typeshed/stdlib/2and3/threading.pyi">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/utils/pbkdf2_hmac.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
<folding>
<element signature="e#46#85#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/utils/log.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92">
<caret line="49" column="39" selection-start-line="49" selection-start-column="39" selection-end-line="49" selection-end-column="39" />
<folding>
<element signature="e#46#85#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/jsoner/functions.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/jsoner/decorators.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret lean-forward="true" />
</state>
</provider>
</entry>
<entry file="file:///Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/logging/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="1457" selection-start-line="1457" selection-end-line="1462" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/jsoner/serializers/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/jsoner/serializers/base_serializer.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="41" selection-start-line="11" selection-start-column="41" selection-end-line="11" selection-end-column="41" />
<folding>
<element signature="e#0#38#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/jsoner/fields/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/jsoner/fields/base_field.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="11" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
<folding>
<element signature="e#0#38#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/jsoner/serializable/base_serializable.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" selection-start-line="6" selection-end-line="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/jsoner/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="40" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/jsoner/serializers/simple_serializer.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="1" column="8" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="8" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
s1zlibs/jsoner/serializers/simple_serializer.py
...@@ -19,8 +19,10 @@ class SimpleSerializer(BaseSerializer): ...@@ -19,8 +19,10 @@ class SimpleSerializer(BaseSerializer):
)) ))
@staticmethod @staticmethod
def raise_value_error(value): def raise_value_error(value, type_required):
raise AttributeError("Could not handle value: {}".format(value)) raise AttributeError("Could not handle value: {}. required: {}".format(
value.__name__, type_required.__name__
))
def get_value_type(self, value_type): def get_value_type(self, value_type):
# If the value type is an array # If the value type is an array
...@@ -31,14 +33,17 @@ class SimpleSerializer(BaseSerializer): ...@@ -31,14 +33,17 @@ class SimpleSerializer(BaseSerializer):
elif value_type in self.handle_types: elif value_type in self.handle_types:
return False, value_type return False, value_type
return self.raise_value_error(value_type) raise AttributeError(("No supported type detected: {}. "
"required one of these: '{}'").format(
value_type, ', '.join([x.__name__ for x in self.handle_types])
))
def check_type(self, values): def check_type(self, values):
# type: (list) -> list # type: (list) -> list
dumped = list() dumped = list()
for raw_data in values: for raw_data in values:
if not isinstance(raw_data, self.value_type): if not isinstance(raw_data, self.value_type):
self.raise_value_error(raw_data) self.raise_value_error(raw_data, self.value_type)
dumped.append(raw_data) dumped.append(raw_data)
return dumped return dumped
...@@ -50,7 +55,11 @@ class SimpleSerializer(BaseSerializer): ...@@ -50,7 +55,11 @@ class SimpleSerializer(BaseSerializer):
elif self.value_is_list and isinstance(value, list): elif self.value_is_list and isinstance(value, list):
return self.check_type(value) return self.check_type(value)
return self.raise_value_error(value) raise AttributeError(("No supported type detected: {}. "
"required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in self.handle_types])
))
def dumps(self, value): def dumps(self, value):
if not self.value_is_list and not isinstance(value, list): if not self.value_is_list and not isinstance(value, list):
...@@ -60,4 +69,8 @@ class SimpleSerializer(BaseSerializer): ...@@ -60,4 +69,8 @@ class SimpleSerializer(BaseSerializer):
elif self.value_is_list and isinstance(value, list): elif self.value_is_list and isinstance(value, list):
return self.check_type(value) return self.check_type(value)
return self.raise_value_error(value) raise AttributeError(("No supported type detected: {}. "
"required one of these: '{}'").format(
value.__class__.__name__,
', '.join([x.__name__ for x in self.handle_types])
))
setup.py
...@@ -5,7 +5,7 @@ with open("README.md", "r") as fh: ...@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
setuptools.setup( setuptools.setup(
name="s1zlibs", name="s1zlibs",
version="1.0.2", version="1.0.3",
author="Barabash Oleksandr", author="Barabash Oleksandr",
author_email="skaltmn@gmail.com", author_email="skaltmn@gmail.com",
description="s1zlibs", description="s1zlibs",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment