Skip to content
This repository was archived by the owner on Dec 10, 2018. It is now read-only.

Commit 90b0bd9

Browse files
committed
Merge pull request #23 from maralla/develop
some minor fix
2 parents 95e6073 + 05710d7 commit 90b0bd9

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

thriftpy/parser.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import functools
55
import hashlib
66
import itertools
7+
import os.path
78
import pickle
89
import types
910

@@ -115,7 +116,8 @@ def load(thrift_file, cache=True):
115116
if thrift_file in _thriftloader:
116117
return _thriftloader[thrift_file]
117118

118-
module_name = thrift_file[:thrift_file.find('.')]
119+
basename = os.path.basename(thrift_file)
120+
module_name, _ = os.path.splitext(basename)
119121

120122
with open(thrift_file, "r") as fp:
121123
schema = fp.read()

thriftpy/server.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ class TThreadedServer(TServer):
5656
"""Threaded server that spawns a new thread per each connection."""
5757

5858
def __init__(self, *args, **kwargs):
59-
TServer.__init__(self, *args)
60-
self.daemon = kwargs.get("daemon", False)
59+
self.daemon = kwargs.pop("daemon", False)
60+
TServer.__init__(self, *args, **kwargs)
6161

6262
def serve(self):
6363
self.trans.listen()

thriftpy/thrift.py

+3
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ def __getattr__(self, api):
108108
if api in self._service.thrift_services:
109109
return functools.partial(self._req, api)
110110

111+
raise AttributeError("{} instance has no attribute '{}'".format(
112+
self.__class__.__name__, api))
113+
111114
def __dir__(self):
112115
return self._service.thrift_services
113116

0 commit comments

Comments
 (0)