Permalink
Commits on Apr 8, 2013
  1. Merge pull request #63 from JasonLunn/master

    m0mchil committed Apr 8, 2013
    Workaround for standard strictness enforcement on OS X
  2. Use MACOSX from detect

    JasonLunn committed Apr 8, 2013
  3. Merge pull request #1 from m0mchil/master

    JasonLunn committed Apr 8, 2013
    Upstream update
  4. Update OpenCLMiner.py

    JasonLunn committed Apr 8, 2013
    Use platform specific logic to avoid know OS X pitfall; see http://wiki.tiker.net/OpenCLOddities
Commits on Apr 3, 2013
  1. Merge pull request #60 from JustinTArthur/use-builtin-ternary

    m0mchil committed Apr 3, 2013
    Replace `if_else` utility function with Python 2.5+'s conditional expression syntax
  2. Merge pull request #59 from JustinTArthur/use-module-rotr-function-fo…

    m0mchil committed Apr 3, 2013
    …r-sha256
    
    Use module-supplied rotr function instead of a lambda in sha256's calculateF
Commits on Apr 2, 2013
  1. Use module-supplied `rotr` function instead of a `lambda` every time …

    JustinTArthur committed Apr 2, 2013
    …`sha256.calculateF` is called.
Commits on Apr 1, 2013
  1. Merge pull request #58 from JustinTArthur/issue-56-improperly-wrapped…

    m0mchil committed Apr 1, 2013
    …-socket-type
    
    Wrap socket type with a class instead of a function.
Commits on Mar 31, 2013
  1. Wrap socket type with a class instead of a function.

    JustinTArthur committed Mar 31, 2013
    By wrapping the `socket.socket` type with a function, we've been emulating only the wrapped type's constructor and not the wrapped type itself. This won't work if we wish to enable long polling for SOCKS connections with the SocksiPy library as this library imports and attempts to construct a class that inherits from the `socket.socket` type.
    
    Original wrapper function was added in 6cf0bc7, but the issue this commit attempts to address was triggered by a change in module import order in a5ab744, where SocksiPy wraps poclbm's own socket wrapper, where before it had been wrapping the system-provided socket type. This commit addresses m0mchil/poclbm#56.  If we don't need long polling on SOCKS, live-mining/poclbm@ce05212c53a30386da94a5aebd1d581d5421a354 is also a fix for the immediate issue.
Commits on Mar 20, 2013
  1. use getwork only on explicit 'http';

    m0mchil committed Mar 20, 2013
    moved patch() from util to OpenCLMiner;
    explicit use of '<' throughout
Commits on Mar 16, 2013
  1. no numpy

    m0mchil committed Mar 16, 2013
Commits on Jan 18, 2013
  1. fixed #55 (Proxy Woes)

    m0mchil committed Jan 18, 2013
  2. minor loging change

    m0mchil committed Jan 18, 2013
Commits on Nov 28, 2012
Commits on Nov 16, 2012
Commits on Nov 14, 2012
  1. some more excludes for py2exe

    m0mchil committed Nov 14, 2012
Commits on Nov 9, 2012
Commits on Oct 30, 2012
  1. implemented stratum reconnect and add_peers

    m0mchil committed Oct 30, 2012
    storing server entries as objects
Commits on Oct 29, 2012
  1. Merge branch 'patch-1' of git://github.com/npinto/poclbm into npinto-…

    m0mchil committed Oct 29, 2012
    …patch-1
    
    Conflicts:
    	poclbm.py
  2. detect stratum proxies

    m0mchil committed Oct 29, 2012
Commits on Oct 17, 2012