10000 bump version · pkdevboxy/PyMySQL@302c679 · GitHub
[go: up one dir, main page]
Skip to content

Commit 302c679

Browse files
methanemethane
committed
bump version
1 parent 13fe3ff commit 302c679

File tree

4 files changed

+19
-25
lines changed

4 files changed

+19
-25
lines changed

‎pymysql/__init__.py

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
'''
1+
"""
22
PyMySQL: A pure-Python MySQL client library.
33
4-
Copyright (c) 2010, 2013 PyMySQL contributors
4+
Copyright (c) 2010-2016 PyMySQL contributors
55
66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,10 @@
2020
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2121
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
THE SOFTWARE.
23+
"""
24+
import sys
2325

24-
'''
25-
26-
VERSION = (0, 6, 7, None)
27-
28-
from ._compat import text_t 10000 ype, JYTHON, IRONPYTHON, PY2
26+
from ._compat import PY2
2927
from .constants import FIELD_TYPE
3028
from .converters import escape_dict, escape_sequence, escape_string
3129
from .err import Warning, Error, InterfaceError, DataError, \
@@ -34,15 +32,14 @@
3432
from .times import Date, Time, Timestamp, \
3533
DateFromTicks, TimeFromTicks, TimestampFromTicks
3634

37-
import sys
38-
3935

36+
VERSION = (0, 7, 0, None)
4037
threadsafety = 1
4138
apilevel = "2.0"
42-
paramstyle = "format"
39+
paramstyle = "pyformat"
4340

44-
class DBAPISet(frozenset):
4541

42+
class DBAPISet(frozenset):
4643

4744
def __ne__(self, other):
4845
if isinstance(other, set):
@@ -73,15 +70,15 @@ def __hash__(self):
7370
DATETIME = TIMESTAMP
7471
ROWID = DBAPISet()
7572

73+
7674
def Binary(x):
7775
"""Return x as a binary type."""
78-
if isinstance(x, text_type) and not (JYTHON or IRONPYTHON):
79-
x = x.encode()
8076
if PY2:
8177
return bytearray(x)
8278
else:
8379
return bytes(x)
8480

81+
8582
def Connect(*args, **kwargs):
8683
"""
8784
Connect to the database; see connections.Connection.__init__() for
@@ -92,11 +89,10 @@ def Connect(*args, **kwargs):
9289

9390
from pymysql import connections as _orig_conn
9491
if _orig_conn.Connection.__init__.__doc__ is not None:
95-
Connect.__doc__ = _orig_conn.Connection.__init__.__doc__ + ("""
96-
See connections.Connection.__init__() for information about defaults.
97-
""")
92+
Connect.__doc__ = _orig_conn.Connection.__init__.__doc__
9893
del _orig_conn
9994

95+
10096
def get_client_info(): # for MySQLdb compatibility
10197
return '.'.join(map(str, VERSION))
10298

@@ -110,7 +106,7 @@ def get_client_info(): # for MySQLdb compatibility
110106
__version__ = get_client_info()
111107

112108
def thread_safe():
113-
return True # match MySQLdb.thread_safe()
109+
return True # match MySQLdb.thread_safe()
114110

115111
def install_as_MySQLdb():
116112
"""
@@ -119,6 +115,7 @@ def install_as_MySQLdb():
119115
"""
120116
sys.modules["MySQLdb"] = sys.modules["_mysql"] = sys.modules["pymysql"]
121117

118+
122119
__all__ = [
123120
'BINARY', 'Binary', 'Connect', 'Connection', 'DATE', 'Date',
124121
'Time', 'Timestamp', 'DateFromTicks', 'TimeFromTicks', 'TimestampFromTicks',
@@ -131,6 +128,5 @@ def install_as_MySQLdb():
131128
'paramstyle', 'threadsafety', 'version_info',
132129

133130
"install_as_MySQLdb",
134-
135-
"NULL","__version__",
136-
]
131+
"NULL", "__version__",
132+
]

‎pymysql/connections.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,6 @@ class Connection(object):
521521
522522
The proper way to get an instance of this class is to call
523523
connect().
524-
525524
"""
526525

527526
socket = None

‎setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ universal = 1
44
[flake8]
55
ignore = E226,E301,E701
66
exclude = tests,build
7-
max-line-length = 99
7+
max-line-length = 119

‎setup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
author_email='yutaka.matsubara@gmail.com',
1717
maintainer='INADA Naoki',
1818
maintainer_email='songofacandy@gmail.com',
19-
description='Pure-Python MySQL Driver',
19+
description='Pure Python MySQL Driver',
2020
license="MIT",
2121
packages=find_packages(),
2222
classifiers=[
2323
'Programming Language :: Python :: 2',
24-
'Programming Language :: Python :: 2.6',
2524
'Programming Language :: Python :: 2.7',
2625
'Programming Language :: Python :: 3',
2726
'Programming Language :: Python :: 3.3',
@@ -33,5 +32,5 @@
3332
'Intended Audience :: Developers',
3433
'License :: OSI Approved :: MIT License',
3534
'Topic :: Database',
36-
]
35+
],
3736
)

0 commit comments

Comments
 (0)
0